Merge branch 'wip-MDL-40540-m26' of git://github.com/samhemelryk/moodle

nealpowell · Jul 23, 2013 · ae2605e · ae2605e
2 parents 01994ec + 83fa6ab
commit ae2605e
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -1471,7 +1471,7 @@ public function initialise_theme_and_output() {
         if ($this->_theme->enable_dock && !empty($CFG->allowblockstodock)) {
             $this->requires->strings_for_js(array('addtodock', 'undockitem', 'dockblock', 'undockblock', 'undockall', 'hidedockpanel', 'hidepanel'), 'block');
             $this->requires->string_for_js('thisdirectionvertical', 'langconfig');
-            $this->requires->yui_module('moodle-core-dockloader', 'M.core.dock.loader.initLoader');
+            $this->requires->yui_module('moodle-core-dock-loader', 'M.core.dock.loader.initLoader');
         }
 
         if ($this === $PAGE) {

diff --git a/...ockloader/moodle-core-dockloader-debug.js → ...k-loader/moodle-core-dock-loader-debug.js b/...ockloader/moodle-core-dockloader-debug.js → ...k-loader/moodle-core-dock-loader-debug.js
@@ -1,4 +1,4 @@
-YUI.add('moodle-core-dockloader', function (Y, NAME) {
+YUI.add('moodle-core-dock-loader', function (Y, NAME) {
 
 var LOADERNAME = 'moodle-core-dock-loader';
 
@@ -37,8 +37,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
         blockaction = blocknode.one('.block_action'),
         icon = 't/block_to_dock';
 
-    // Must set the image src seperatly of we get an error with XML strict headers
-    if (right_to_left()) {
+    // Must set the image src separately of we get an error with XML strict headers
+    if (Y.one(document.body).hasClass('dir-rtl')) {
         icon = icon + '_rtl';
     }
     moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

diff --git a/lib/yui/build/moodle-core-dock-loader/moodle-core-dock-loader-min.js b/lib/yui/build/moodle-core-dock-loader/moodle-core-dock-loader-min.js
diff --git a/...core-dockloader/moodle-core-dockloader.js → ...re-dock-loader/moodle-core-dock-loader.js b/...core-dockloader/moodle-core-dockloader.js → ...re-dock-loader/moodle-core-dock-loader.js
@@ -1,4 +1,4 @@
-YUI.add('moodle-core-dockloader', function (Y, NAME) {
+YUI.add('moodle-core-dock-loader', function (Y, NAME) {
 
 var LOADERNAME = 'moodle-core-dock-loader';
 
@@ -37,8 +37,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
         blockaction = blocknode.one('.block_action'),
         icon = 't/block_to_dock';
 
-    // Must set the image src seperatly of we get an error with XML strict headers
-    if (right_to_left()) {
+    // Must set the image src separately of we get an error with XML strict headers
+    if (Y.one(document.body).hasClass('dir-rtl')) {
         icon = icon + '_rtl';
     }
     moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js b/lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js
@@ -2172,6 +2172,6 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
         "event-mouseenter",
         "event-resize",
         "escape",
-        "moodle-core-dockloader"
+        "moodle-core-dock-loader"
     ]
 });
diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock-min.js b/lib/yui/build/moodle-core-dock/moodle-core-dock-min.js
diff --git a/lib/yui/build/moodle-core-dock/moodle-core-dock.js b/lib/yui/build/moodle-core-dock/moodle-core-dock.js
@@ -2154,6 +2154,6 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
         "event-mouseenter",
         "event-resize",
         "escape",
-        "moodle-core-dockloader"
+        "moodle-core-dock-loader"
     ]
 });
diff --git a/lib/yui/build/moodle-core-dockloader/moodle-core-dockloader-min.js b/lib/yui/build/moodle-core-dockloader/moodle-core-dockloader-min.js
diff --git a/lib/yui/src/dock/build.json b/lib/yui/src/dock/build.json
@@ -11,9 +11,9 @@
         "dockeditem.js"
       ]
     },
-    "moodle-core-dockloader": {
+    "moodle-core-dock-loader": {
         "jsfiles": [
-            "dockloader.js"
+            "loader.js"
         ]
     }
   }

diff --git a/lib/yui/src/dock/js/dockloader.js → lib/yui/src/dock/js/loader.js b/lib/yui/src/dock/js/dockloader.js → lib/yui/src/dock/js/loader.js
@@ -35,8 +35,8 @@ M.core.dock.ensureMoveToIconExists = function(blocknode) {
         blockaction = blocknode.one('.block_action'),
         icon = 't/block_to_dock';
 
-    // Must set the image src seperatly of we get an error with XML strict headers
-    if (right_to_left()) {
+    // Must set the image src separately of we get an error with XML strict headers
+    if (Y.one(document.body).hasClass('dir-rtl')) {
         icon = icon + '_rtl';
     }
     moveto.setAttribute('alt', M.util.get_string('addtodock', 'block'));

diff --git a/lib/yui/src/dock/meta/dock.json b/lib/yui/src/dock/meta/dock.json
@@ -7,10 +7,10 @@
         "event-mouseenter",
         "event-resize",
         "escape",
-        "moodle-core-dockloader"
+        "moodle-core-dock-loader"
     ]
   },
-  "moodle-core-dockloader": {
+  "moodle-core-dock-loader": {
       "requires": [
           "escape"
       ]