MDL-30811 javascript: alert JS should be in template

By moving the JS required for an alert to the JavaScript we make it
possible for themers to use frameworks other than bootstrap if they so
wish.

diff --git a/lib/amd/build/notification.min.js b/lib/amd/build/notification.min.js
index d6b1ee7..f03cbbb 100644 (file)
Binary files a/lib/amd/build/notification.min.js and b/lib/amd/build/notification.min.js differ

diff --git a/lib/amd/src/notification.js b/lib/amd/src/notification.js
index bb8cdb4..da34f43 100644 (file)
--- a/lib/amd/src/notification.js
+++ b/lib/amd/src/notification.js
@@ -26,8 +26,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
  */
-define(['core/yui', 'jquery', 'theme_bootstrapbase/bootstrap', 'core/log'],
-function(Y, $, bootstrap, log) {
+define(['core/yui', 'jquery', 'core/log'],
+function(Y, $, log) {
     var notificationModule = {
         types: {
             'success':  'core/notification_success',
@@ -114,8 +114,9 @@ function(Y, $, bootstrap, log) {
             }
             require(['core/templates'], function(templates) {
                 templates.render(template, variables)
-                    .done(function(html) {
+                    .done(function(html, js) {
                         $('#' + notificationModule.fieldName).prepend(html);
+                        templates.runTemplateJS(js);
                     })
                     .fail(notificationModule.exception)
                     ;
@@ -178,9 +179,6 @@ function(Y, $, bootstrap, log) {
             // Setup the message target region if it isn't setup already
             notificationModule.setupTargetRegion();
 
-            // Setup closing of bootstrap alerts.
-            $().alert();
-
             // Add provided notifications.
             notificationModule.addNotifications(notifications);
 

diff --git a/lib/templates/notification_error.mustache b/lib/templates/notification_error.mustache
index 0e7a8c8..8eb9884 100644 (file)
--- a/lib/templates/notification_error.mustache
+++ b/lib/templates/notification_error.mustache
@@ -42,3 +42,9 @@
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
 </div>
+{{# js }}
+require(['jquery', 'theme_bootstrapbase/bootstrap'], function($) {
+    // Setup closing of bootstrap alerts.
+    $().alert();
+});
+{{/ js }}

diff --git a/lib/templates/notification_info.mustache b/lib/templates/notification_info.mustache
index 39cd151..4a59649 100644 (file)
--- a/lib/templates/notification_info.mustache
+++ b/lib/templates/notification_info.mustache
@@ -42,3 +42,9 @@
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
 </div>
+{{# js }}
+require(['jquery', 'theme_bootstrapbase/bootstrap'], function($) {
+    // Setup closing of bootstrap alerts.
+    $().alert();
+});
+{{/ js }}

diff --git a/lib/templates/notification_success.mustache b/lib/templates/notification_success.mustache
index 65b7e48..150fc3f 100644 (file)
--- a/lib/templates/notification_success.mustache
+++ b/lib/templates/notification_success.mustache
@@ -42,3 +42,9 @@
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
 </div>
+{{# js }}
+require(['jquery', 'theme_bootstrapbase/bootstrap'], function($) {
+    // Setup closing of bootstrap alerts.
+    $().alert();
+});
+{{/ js }}

diff --git a/lib/templates/notification_warning.mustache b/lib/templates/notification_warning.mustache
index b359d83..c5c9944 100644 (file)
--- a/lib/templates/notification_warning.mustache
+++ b/lib/templates/notification_warning.mustache
@@ -42,3 +42,9 @@
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
 </div>
+{{# js }}
+require(['jquery', 'theme_bootstrapbase/bootstrap'], function($) {
+    // Setup closing of bootstrap alerts.
+    $().alert();
+});
+{{/ js }}