Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle

Conflicts: lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
Andmat7 · Oct 29, 2013 · 5fb9161 · 5fb9161
2 parents afb5f28 + dd8e6cd
commit 5fb9161
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js
@@ -74,8 +74,8 @@ Y.extend(FORMAUTOSUBMIT, Y.Base, {
         startindex = select.getData('startindex');
         currentindex = select.get('selectedIndex');
 
-        previousindex = select.getAttribute('data-previousindex');
-        select.setAttribute('data-previousindex', currentindex);
+        previousindex = parseInt(select.getData('previousindex'), 10);
+        select.setData('previousindex', currentindex);
         if (!previousindex) {
             previousindex = startindex;
         }

diff --git a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
diff --git a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js
@@ -73,8 +73,8 @@ Y.extend(FORMAUTOSUBMIT, Y.Base, {
         startindex = select.getData('startindex');
         currentindex = select.get('selectedIndex');
 
-        previousindex = select.getAttribute('data-previousindex');
-        select.setAttribute('data-previousindex', currentindex);
+        previousindex = parseInt(select.getData('previousindex'), 10);
+        select.setData('previousindex', currentindex);
         if (!previousindex) {
             previousindex = startindex;
         }

diff --git a/lib/yui/src/formautosubmit/js/formautosubmit.js b/lib/yui/src/formautosubmit/js/formautosubmit.js
@@ -72,8 +72,8 @@ Y.extend(FORMAUTOSUBMIT, Y.Base, {
         startindex = select.getData('startindex');
         currentindex = select.get('selectedIndex');
 
-        previousindex = select.getAttribute('data-previousindex');
-        select.setAttribute('data-previousindex', currentindex);
+        previousindex = parseInt(select.getData('previousindex'), 10);
+        select.setData('previousindex', currentindex);
         if (!previousindex) {
             previousindex = startindex;
         }