MDL-42928 JavaScript: Disable lockScroll for small chooserdialogues

moodle · Jan 28, 2014 · 478d82d · 478d82d
1 parent 73747ae
commit 478d82d
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js
@@ -215,6 +215,20 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
+        // If the dialogue is larger than a reasonable minimum height, we
+        // disable the page scrollbars.
+        if (newheight > this.get('minheight')) {
+            // Disable the page scrollbars.
+            if (this.panel.lockScroll && !this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.enableScrollLock();
+            }
+        } else {
+            // Re-enable the page scrollbars.
+            if (this.panel.lockScroll && this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.disableScrollLock();
+            }
+        }
+
         // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
         // new max-height
         totalheight = newheight;

diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js
diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue.js
@@ -215,6 +215,20 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
+        // If the dialogue is larger than a reasonable minimum height, we
+        // disable the page scrollbars.
+        if (newheight > this.get('minheight')) {
+            // Disable the page scrollbars.
+            if (this.panel.lockScroll && !this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.enableScrollLock();
+            }
+        } else {
+            // Re-enable the page scrollbars.
+            if (this.panel.lockScroll && this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.disableScrollLock();
+            }
+        }
+
         // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
         // new max-height
         totalheight = newheight;

diff --git a/lib/yui/src/chooserdialogue/js/chooserdialogue.js b/lib/yui/src/chooserdialogue/js/chooserdialogue.js
@@ -213,6 +213,20 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
             }
         }
 
+        // If the dialogue is larger than a reasonable minimum height, we
+        // disable the page scrollbars.
+        if (newheight > this.get('minheight')) {
+            // Disable the page scrollbars.
+            if (this.panel.lockScroll && !this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.enableScrollLock();
+            }
+        } else {
+            // Re-enable the page scrollbars.
+            if (this.panel.lockScroll && this.panel.lockScroll.isActive()) {
+                this.panel.lockScroll.disableScrollLock();
+            }
+        }
+
         // Take off 15px top and bottom for borders, plus 40px each for the title and button area before setting the
         // new max-height
         totalheight = newheight;