Skip to content

Commit 7e16e4b

Browse files
committed
Triggered abp.dynamicScriptsInitialized event and registered by sweetAlert. Resolved aspnetboilerplate#463.
1 parent 97ecebb commit 7e16e4b

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

src/Abp.Web.Mvc/Web/Mvc/Controllers/AbpScriptsController.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,20 @@ public async Task<ActionResult> GetScripts()
6767

6868
sb.AppendLine(await _settingScriptManager.GetScriptAsync());
6969

70+
sb.AppendLine(GetTriggerScript());
71+
7072
return Content(sb.ToString(), "application/x-javascript", Encoding.UTF8);
7173
}
74+
75+
private string GetTriggerScript()
76+
{
77+
var script = new StringBuilder();
78+
79+
script.AppendLine("(function(){");
80+
script.AppendLine(" abp.event.trigger('abp.dynamicScriptsInitialized');");
81+
script.Append("})();");
82+
83+
return script.ToString();
84+
}
7285
}
7386
}

src/Abp.Web.Resources/Abp/Framework/scripts/libs/abp.sweet-alert.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
},
2727
confirm: {
2828
type: 'warning',
29-
title: abp.localization.abpWeb('AreYouSure'),
29+
title: 'Are you sure?',
3030
showCancelButton: true,
31-
cancelButtonText: abp.localization.abpWeb('Cancel'),
31+
cancelButtonText: 'Cancel',
3232
confirmButtonColor: "#DD6B55",
33-
confirmButtonText: abp.localization.abpWeb('Yes')
33+
confirmButtonText: 'Yes'
3434
}
3535
}
3636
};
@@ -54,8 +54,8 @@
5454
);
5555

5656
return $.Deferred(function ($dfd) {
57-
sweetAlert(opts, function (value) {
58-
$dfd.resolve(value);
57+
sweetAlert(opts, function () {
58+
$dfd.resolve();
5959
});
6060
});
6161
};
@@ -97,9 +97,15 @@
9797
return $.Deferred(function ($dfd) {
9898
sweetAlert(opts, function (isConfirmed) {
9999
callback && callback(isConfirmed);
100-
$dfd.resolve(isConfirmed);
100+
$dfd.resolve();
101101
});
102102
});
103103
};
104104

105+
abp.event.on('abp.dynamicScriptsInitialized', function () {
106+
abp.libs.sweetAlert.config.confirm.title = abp.localization.abpWeb('AreYouSure');
107+
abp.libs.sweetAlert.config.confirm.cancelButtonText = abp.localization.abpWeb('Cancel');
108+
abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
109+
});
110+
105111
})(jQuery);

0 commit comments

Comments
 (0)