Merge branch 'MDL-49262-master' of git://github.com/damyon/moodle

robjoyce · Mar 24, 2015 · eaad7d3 · eaad7d3
2 parents 4c243a2 + d2b6447
commit eaad7d3
Show file tree

Hide file tree

Showing 13 changed files with 2,279 additions and 2,196 deletions.
diff --git a/theme/bootstrapbase/amd/build/bootstrap.min.js b/theme/bootstrapbase/amd/build/bootstrap.min.js
diff --git a/theme/bootstrapbase/amd/src/bootstrap.js b/theme/bootstrapbase/amd/src/bootstrap.js
diff --git a/theme/bootstrapbase/javascript/moodlebootstrap.js b/theme/bootstrapbase/javascript/moodlebootstrap.js
@@ -1,5 +1,6 @@
-// We need to actually use the code manually here as this is tricky do in
-// themes at present.
-YUI().use('moodle-theme_bootstrapbase-bootstrap', function(Y) {
-    Y.Moodle.theme_bootstrapbase.bootstrap.init();
+
+require(['core/first'], function() {
+    require(['theme_bootstrapbase/bootstrap', 'core/log'], function(bootstrap) {
+        log.debug('Bootstrap initialised');
+    });
 });