Merge branch 'MDL-42393-27' of git://github.com/FMCorz/moodle into MO…

…ODLE_27_STABLE
moodle · Jul 7, 2014 · 9945bce · 9945bce
2 parents b4ac565 + 31c0efe
commit 9945bce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-debug.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-debug.js
@@ -62,6 +62,7 @@ Y.extend(EVENT, Y.Base, {
         }
     },
     startShow : function() {
+        this.cancelHide();
         if (this.get(SHOWTIMEOUT) !== null) {
             this.cancelShow();
         }
@@ -82,6 +83,7 @@ Y.extend(EVENT, Y.Base, {
         this.fire('showevent');
     },
     startHide : function() {
+        this.cancelShow();
         if (this.get(HIDETIMEOUT) !== null) {
             this.cancelHide();
         }

diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-min.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-min.js
diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager.js
@@ -62,6 +62,7 @@ Y.extend(EVENT, Y.Base, {
         }
     },
     startShow : function() {
+        this.cancelHide();
         if (this.get(SHOWTIMEOUT) !== null) {
             this.cancelShow();
         }
@@ -82,6 +83,7 @@ Y.extend(EVENT, Y.Base, {
         this.fire('showevent');
     },
     startHide : function() {
+        this.cancelShow();
         if (this.get(HIDETIMEOUT) !== null) {
             this.cancelHide();
         }

diff --git a/calendar/yui/src/eventmanager/js/eventmanager.js b/calendar/yui/src/eventmanager/js/eventmanager.js
@@ -60,6 +60,7 @@ Y.extend(EVENT, Y.Base, {
         }
     },
     startShow : function() {
+        this.cancelHide();
         if (this.get(SHOWTIMEOUT) !== null) {
             this.cancelShow();
         }
@@ -80,6 +81,7 @@ Y.extend(EVENT, Y.Base, {
         this.fire('showevent');
     },
     startHide : function() {
+        this.cancelShow();
         if (this.get(HIDETIMEOUT) !== null) {
             this.cancelHide();
         }