From 859bef6fe0857f670234dfc2d30d4490002bbc36 Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Fri, 1 Jun 2012 08:40:39 +0000 Subject: [PATCH] Item11917: fixing upstream bug calculating the height of modal dialogs git-svn-id: http://svn.foswiki.org/trunk@14943 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- JQueryPlugin/data/System/JQueryPlugin.txt | 7 +++---- .../simplemodal/jquery.simplemodal-1.4.2.patch | 13 +++++++++++++ .../simplemodal/jquery.simplemodal.uncompressed.js | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal-1.4.2.patch diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt index ac736567a5..03e74003b5 100644 --- a/JQueryPlugin/data/System/JQueryPlugin.txt +++ b/JQueryPlugin/data/System/JQueryPlugin.txt @@ -24,9 +24,8 @@ your web pages." 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 @@ -137,7 +136,7 @@ reduce bandwidth and speed up interactive performance. | Release: | %$RELEASE% | | Version: | %$VERSION% | | Change History: |   | -| 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 | diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal-1.4.2.patch b/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal-1.4.2.patch new file mode 100644 index 0000000000..573cd958ee --- /dev/null +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal-1.4.2.patch @@ -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(); + }, diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal.uncompressed.js index 0bdedf435f..841b421b56 100644 --- a/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal.uncompressed.js +++ b/JQueryPlugin/pub/System/JQueryPlugin/plugins/simplemodal/jquery.simplemodal.uncompressed.js @@ -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(); },