Skip to content

Commit

Permalink
Item11917: fixing upstream bug calculating the height of modal dialogs
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@14943 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Jun 1, 2012
1 parent 6248b1d commit 859bef6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
7 changes: 3 additions & 4 deletions JQueryPlugin/data/System/JQueryPlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ your web pages."
</table>

Besides jQuery itself, !JQueryPlugin comes with a selection of third party plugins that are thought to be essential for modern web applications.
These are integrated into Foswiki either by means of a special [[#Macros][macro]], by means of "minimal markup", or initialized using
a custom javascript initializer. This way the set of Foswiki macros that comes with !JQueryPlugin is kept rather low compared to the features available
in third party plugins. "Minimal markup" is a way to avoid the need to write javascript code to initialize the interface. Instead, a special
These are integrated into Foswiki either by means of a special [[#Macros][macro]], by "minimal markup", or custom javascript initializer. "Minimal markup"
is a way to avoid the need to write javascript code to initialize the interface. Instead, a special
css class is added to an html element that triggers its initialization. See %SYSTEMWEB%.JQueryMetadata for an example.

Use [[#VarJQREQUIRE][JQREQUIRE]] to make use of a specific jQuery plugin on a page. This will prepare the page by loading the required javascript
Expand Down Expand Up @@ -137,7 +136,7 @@ reduce bandwidth and speed up interactive performance.
| Release: | %$RELEASE% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 01 Jun 2012: | (4.42) - simplemodal updated to 1.4.2. |
| 01 Jun 2012: | (4.42) - Item11917. simplemodal updated to 1.4.2. fixed upstream bug computing dialog heights |
| 23 May 2012: | (4.41) - Item11889. \
added means to hide the close button on textboxlist values; \
docu improvements to textboxlixst and pnotify |
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: jquery.simplemodal.uncompressed.js
===================================================================
--- jquery.simplemodal.uncompressed.js (revision 14942)
+++ jquery.simplemodal.uncompressed.js (working copy)
@@ -582,7 +582,7 @@
cw = s.o.autoResize && cw > mw ? mw : cw < mow ? mow : cw;
}

- s.d.container.css({height: ch, width: cw});
+ s.d.container.css({width: cw});
s.d.wrap.css({overflow: (dh > ch || dw > cw) ? 'auto' : 'visible'});
s.o.autoPosition && s.setPosition();
},
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
cw = s.o.autoResize && cw > mw ? mw : cw < mow ? mow : cw;
}

s.d.container.css({height: ch, width: cw});
s.d.container.css({width: cw});
s.d.wrap.css({overflow: (dh > ch || dw > cw) ? 'auto' : 'visible'});
s.o.autoPosition && s.setPosition();
},
Expand Down

0 comments on commit 859bef6

Please sign in to comment.