Item12215: fixed hiding of jquery loader early enough

git-svn-id: http://svn.foswiki.org/trunk@15822 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 1, 2012 · 6e0f9b5 · 6e0f9b5
1 parent 49119c3
commit 6e0f9b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm
@@ -12,10 +12,11 @@ sub new {
     my $this = bless(
         $class->SUPER::new(
             name         => 'Loader',
-            version      => '1.00',
+            version      => '1.01',
             author       => 'Michael Daum',
             homepage     => 'http://foswiki.org/Extensions/JQueryPlugin',
             tags         => 'LOADER',
+            css          => ['jquery.loader.css'],
             javascript   => ['jquery.loader.js'],
             dependencies => ['metadata'],
         ),

diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/MANIFEST
@@ -381,6 +381,9 @@ pub/System/JQueryPlugin/plugins/livequery/Makefile 0644
 pub/System/JQueryPlugin/plugins/loader/jquery.loader.js 0644
 pub/System/JQueryPlugin/plugins/loader/jquery.loader.js.gz 0644
 pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js 0644
+pub/System/JQueryPlugin/plugins/loader/jquery.loader.css 0644
+pub/System/JQueryPlugin/plugins/loader/jquery.loader.css.gz 0644
+pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.css 0644
 pub/System/JQueryPlugin/plugins/loader/Makefile 0644
 pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js 0644
 pub/System/JQueryPlugin/plugins/localscroll/jquery.localscroll.js.gz 0644
@@ -723,6 +726,8 @@ pub/System/JQueryPlugin/themes/foswiki/images/ui-bg_flat_0_aaaaaa_40x100.png 064
 pub/System/JQueryPlugin/themes/foswiki/images/ui-icons_666666_256x240.png 0644
 pub/System/JQueryPlugin/themes/foswiki/images/ui-icons-famfamfam.png 0644
 pub/System/JQueryPlugin/themes/foswiki/images/x.png 0644
+pub/System/JQueryPlugin/themes/foswiki/images/select2.png 0644
+pub/System/JQueryPlugin/themes/foswiki/images/select2x2.png 0644
 pub/System/JQueryPlugin/themes/foswiki/jquery-ui.css 0644
 pub/System/JQueryPlugin/themes/foswiki/jquery-ui.css.gz 0644
 pub/System/JQueryPlugin/themes/foswiki/jquery-ui.uncompressed.css 0644

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/Makefile b/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/Makefile
@@ -1,5 +1,6 @@
 TARGET=\
   jquery.loader.js \
+  jquery.loader.css \
   $(JQUERYPLUGIN_LIB)/LOADER.pm
 
 -include ../../Makefile.include
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.css b/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.css
@@ -0,0 +1,3 @@
+.jqLoader {
+  display:none;
+}
diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js
@@ -46,8 +46,6 @@ jQuery(function($) {
     var self = this,
         $elem = $(self.element);
 
-    $elem.hide();
-
     // construct load url
     if (typeof(self.options.section) !== 'undefined') {
       self.options.url =