Changeset 23ec10 in indico

Timestamp:

04/05/11 13:22:30 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

2b11e5

Parents:

cf4381

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (04/05/11 12:29:06)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/05/11 13:22:30)

Message:

[FIX] only apply width fix for popups

Location:

indico/htdocs/js/indico/Core

Files:

• Dialogs/Popup.js (modified) (2 diffs)
• Widgets/Base.js (modified) (2 diffs)

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -1 +1 @@
 type("PopupDialog", ["PopupWidget"], {
     draw: function(content, x, y) {
-        return this.PopupWidget.prototype.draw.call(this, content, x, y);
+        return this.PopupWidget.prototype.draw.call(this, content, x, y, null, true);
     },
 
@@ -121 +121 @@
 
 
-        return this.PopupWidget.prototype.draw.call(this, this.container, 0, 0);
+        return this.PopupWidget.prototype.draw.call(this, this.container, 0, 0, null, true);
     },
 

indico/htdocs/js/indico/Core/Widgets/Base.js

@@ -878 +878 @@
 
 type("PopupWidget", [], {
-    draw: function(content, x, y, styles) {
+    draw: function(content, x, y, styles, setWidth) {
         var self = this;
 
@@ -893 +893 @@
         }
 
-        // taken from jQuery width() function. TODO: replace with less-ugly code as soon as we have jquery embedded globally
-        var width = ('scrollTo' in document && document) ?
-                document.compatMode === "CSS1Compat" && document.documentElement.clientWidth || document.body.clientWidth :
-                Math.max(document.documentElement.clientWidth, document.body.scrollWidth, document.documentElement.scrollWidth,
-                         document.body.offsetWidth, document.documentElement.offsetWidth);
-        width -= x;
         styles = any(styles, {
             // If the canvas has been set to fixed position don't change it
             position: this.canvas.dom.style.position == 'fixed' ? 'fixed' : 'absolute',
             left: pixels(x),
-            top: pixels(y),
-            width: pixels(width)
+            top: pixels(y)
         });
+
+        if(setWidth) {
+            // taken from jQuery width() function. TODO: replace with less-ugly code as soon as we have jquery embedded globally
+            var width = ('scrollTo' in document && document) ?
+                    document.compatMode === "CSS1Compat" && document.documentElement.clientWidth || document.body.clientWidth :
+                    Math.max(document.documentElement.clientWidth, document.body.scrollWidth, document.documentElement.scrollWidth,
+                             document.body.offsetWidth, document.documentElement.offsetWidth);
+            width -= x;
+            styles.width = pixels(width);
+        }
 
         each(styles, function(value, key) {