Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 29 Oct 2013 05:57:51 +0000 (13:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 29 Oct 2013 05:57:51 +0000 (13:57 +0800)
Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js

lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js
lib/yui/src/formautosubmit/js/formautosubmit.js

index 55abf69..b62338a 100644 (file)
Binary files a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js and b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-debug.js differ
index 8b5f752..bbe45e4 100644 (file)
Binary files a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js and b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js differ
index 098b6a3..5caab5b 100644 (file)
Binary files a/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js and b/lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit.js differ
index ac5e1b6..a7f1e27 100644 (file)
@@ -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;
         }