Changeset 6898

Timestamp:

03/25/10 10:28:02 (2 years ago)

Author:

MichaelDaum

Message:

Item8655:

• backing out uggly ZonePlugin wrapper: this won't be needed
• fixing issues discovered by jslint

Location:

trunk/JQueryPlugin

Files:

• data/System/JQueryPlugin.txt (modified) (1 diff)
• lib/Foswiki/Plugins/JQueryPlugin.pm (modified) (1 diff)
• lib/Foswiki/Plugins/JQueryPlugin/FOSWIKI.pm (modified) (1 diff)
• lib/Foswiki/Plugins/JQueryPlugin/GRID.pm (modified) (2 diffs)
• lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm (modified) (3 diffs)
• lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm (modified) (1 diff)
• lib/Foswiki/Plugins/JQueryPlugin/TOGGLE.pm (modified) (1 diff)
• lib/Foswiki/Plugins/JQueryPlugin/VALIDATE.pm (modified) (1 diff)
• pub/System/JQueryPlugin/i18n/Makefile (modified) (1 diff)
• pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js (modified) (4 diffs)
• pub/System/JQueryPlugin/plugins/textboxlist/jquery.textboxlist.uncompressed.js (modified) (5 diffs)
• pub/System/JQueryPlugin/plugins/treeview/jquery.treeview.uncompressed.css (modified) (1 diff)

trunk/JQueryPlugin/data/System/JQueryPlugin.txt

@@ -102 +102 @@
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  20 Mar 2010 (3.31): | Minifier CPAN libs removed from plugin. They will be in core CPAN lib in Foswiki 1.1 |
-|  14 Mar 2010 (3.30): | upgraded =validate= to v1.7; added =wikiword= validation method; \
+|  20 Mar 2010: | (3.31) Minifier CPAN libs removed from plugin. They will be in core CPAN lib in Foswiki 1.1 |
+|  14 Mar 2010: | (3.30) upgraded =validate= to v1.7; added =wikiword= validation method; \
                   fixed computation of line-height in =fluidfont=; \
                   fixed height issue in =tabpane= |

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm

@@ -417 +417 @@
 }
 
-=begin TML
-
----++ ourAddToZone($zone, $tag, $text, $requires)
-
-This is a simple wrapper to call Foswiki::Func::addToZone() if available, or
-Foswiki::Func::addToHead() otherwise (in which case, everything is added to head)
-
-=cut
-
-sub ourAddToZone {
-  my ($zone, $tag, $text, $requires) = @_;
-         
-  if (not exists &Foswiki::Func::addToZone) {
-    Foswiki::Func::addToHEAD($tag, $text, $requires);
-  } else {
-    Foswiki::Func::addToZone($zone, $tag, $text, $requires);
-  }
-
-  return;
-}
-
-
 1;

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/FOSWIKI.pm

@@ -91 +91 @@
   my $footer = "<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/foswiki/$js'></script>\n";
 
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('head', 'JQUERYPLUGIN::FOSWIKI', $header, 'JQUERYPLUGIN');
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', 'JQUERYPLUGIN::FOSWIKI', $footer, 'JQUERYPLUGIN');
+  Foswiki::Func::addToZone('head', 'JQUERYPLUGIN::FOSWIKI', $header, 'JQUERYPLUGIN');
+  Foswiki::Func::addToZone('body', 'JQUERYPLUGIN::FOSWIKI', $footer, 'JQUERYPLUGIN');
 
 }

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/GRID.pm

@@ -87 +87 @@
 
   my $header .= "<script type='text/javascript' src='$Foswiki::cfg{PubUrlPath}/$localePath'></script>\n";
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', "JQUERYPLUGIN::GRID::LANG", $header, 'JQUERYPLUGIN::UI');
+  Foswiki::Func::addToZone('body', "JQUERYPLUGIN::GRID::LANG", $header, 'JQUERYPLUGIN::UI');
 }
 
@@ -223 +223 @@
 HERE
 
-    Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', "JQUERYPLUGIN::GRID::$gridId", $jsTemplate, 'JQUERYPLUGIN::GRID');
+    Foswiki::Func::addToZone('body', "JQUERYPLUGIN::GRID::$gridId", $jsTemplate, 'JQUERYPLUGIN::GRID');
 
     my $result = "<table id='$gridId'></table>";

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugin.pm

@@ -76 +76 @@
   }
 
+
   return $this;
 }
@@ -99 +100 @@
   # load all css
   foreach my $css (@{$this->{css}}) {
-    $css =~ s/\.css$/.uncompressed.css/ if $this->{debug};
-    $css .= '?version='.$this->{version};
-    $header .= "<link rel='stylesheet' href='$this->{puburl}/$css' type='text/css' media='all' />\n";
+    $header .= $this->renderCSS($css);
   }
 
   # load all javascript
   foreach my $js (@{$this->{javascript}}) {
-    $js =~ s/\.js$/.uncompressed.js/ if $this->{debug};
-    $js .= '?version='.$this->{version};
-    $footer .= "<script type='text/javascript' src='$this->{puburl}/$js'></script>\n";
+    $footer .= $this->renderJS($js);
   }
 
@@ -122 +119 @@
   }
 
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('head', "JQUERYPLUGIN::".uc($this->{name}), $header, join(', ', @dependencies))
+  Foswiki::Func::addToZone('head', "JQUERYPLUGIN::".uc($this->{name}), $header, join(', ', @dependencies))
     if $header;
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', "JQUERYPLUGIN::".uc($this->{name}), $footer, join(', ', @dependencies))
+  Foswiki::Func::addToZone('body', "JQUERYPLUGIN::".uc($this->{name}), $footer, join(', ', @dependencies))
     if $footer;
 
   return 1;
+}
+
+sub renderCSS {
+  my ($this, $text) = @_;
+
+  $text =~ s/\.css$/.uncompressed.css/ if $this->{debug};
+  $text .= '?version='.$this->{version};
+  $text = "<link rel='stylesheet' href='$this->{puburl}/$text' type='text/css' media='all' />\n";
+
+  return $text;
+}
+
+sub renderJS {
+  my ($this, $text) = @_;
+
+  $text =~ s/\.js$/.uncompressed.js/ if $this->{debug};
+  $text .= '?version='.$this->{version};
+  $text = "<script type='text/javascript' src='$this->{puburl}/$text'></script>\n";
+
+  return $text;
 }
 

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Plugins.pm

@@ -63 +63 @@
     if $Foswiki::cfg{JQueryPlugin}{NoConflict};
 
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', 'JQUERYPLUGIN', $footer);
+  Foswiki::Func::addToZone('body', 'JQUERYPLUGIN', $footer);
 
   # initial plugins
   createPlugin('Foswiki'); # this one is needed anyway
+
   my $defaultPlugins = $Foswiki::cfg{JQueryPlugin}{DefaultPlugins};
   if ($defaultPlugins) {

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/TOGGLE.pm

@@ -97 +97 @@
   my $toggleId = "jqToggle".Foswiki::Plugins::JQueryPlugin::Plugins::getRandom();
 
-  Foswiki::Plugins::JQueryPlugin::ourAddToZone("head", "JQUERYPLUGIN::TOGGLE::$toggleId", <<"HERE", 'JQUERYPLUGIN::TOGGLE');
+  Foswiki::Func::addToZone("head", "JQUERYPLUGIN::TOGGLE::$toggleId", <<"HERE", 'JQUERYPLUGIN::TOGGLE');
 <meta name="foswiki.jquery.toggle.$toggleId" content="{id:'$toggleId', onclick:$cmd}" />
 HERE

trunk/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/VALIDATE.pm

@@ -74 +74 @@
   if (-f $messageFile) {
     $header .= "<script type='text/javascript' src='$Foswiki::cfg{PubUrlPath}/$messagePath'></script>\n";
-    Foswiki::Plugins::JQueryPlugin::ourAddToZone('body', "JQUERYPLUGIN::VALIDATE::LANG", $header, 'JQUERYPLUGIN::VALIDATE');
+    Foswiki::Func::addToZone('body', "JQUERYPLUGIN::VALIDATE::LANG", $header, 'JQUERYPLUGIN::VALIDATE');
   }
 

trunk/JQueryPlugin/pub/System/JQueryPlugin/i18n/Makefile

@@ -1 @@
-all: jquery-ui-i18n.js jquery-ui-i18n.js.gz
+TARGET=jquery-ui-i18n.js 
 -include ../Makefile.include
+
+UI_DATEPICKER_SOURCE=\
+  ui.datepicker-ar.js\
+  ui.datepicker-bg.js\
+  ui.datepicker-ca.js\
+  ui.datepicker-cs.js\
+  ui.datepicker-da.js\
+  ui.datepicker-de.js\
+  ui.datepicker-el.js\
+  ui.datepicker-eo.js\
+  ui.datepicker-es.js\
+  ui.datepicker-fa.js\
+  ui.datepicker-fi.js\
+  ui.datepicker-fr.js\
+  ui.datepicker-he.js\
+  ui.datepicker-hr.js\
+  ui.datepicker-hu.js\
+  ui.datepicker-hy.js\
+  ui.datepicker-id.js\
+  ui.datepicker-is.js\
+  ui.datepicker-it.js\
+  ui.datepicker-ja.js\
+  ui.datepicker-ko.js\
+  ui.datepicker-lt.js\
+  ui.datepicker-lv.js\
+  ui.datepicker-ms.js\
+  ui.datepicker-nl.js\
+  ui.datepicker-no.js\
+  ui.datepicker-pl.js\
+  ui.datepicker-pt-BR.js\
+  ui.datepicker-ro.js\
+  ui.datepicker-ru.js\
+  ui.datepicker-sk.js\
+  ui.datepicker-sl.js\
+  ui.datepicker-sq.js\
+  ui.datepicker-sr-SR.js\
+  ui.datepicker-sr.js\
+  ui.datepicker-sv.js\
+  ui.datepicker-th.js\
+  ui.datepicker-tr.js\
+  ui.datepicker-uk.js\
+  ui.datepicker-zh-CN.js\
+  ui.datepicker-zh-TW.js
+
+jquery-ui-i18n.uncompressed.js: $(UI_DATEPICKER_SOURCE)
+        @echo "creating $@"
+        @$(CAT) $(UI_DATEPICKER_SOURCE) > $@
+

trunk/JQueryPlugin/pub/System/JQueryPlugin/plugins/foswiki/jquery.foswiki.uncompressed.js

@@ -5 +5 @@
 */
 var foswiki;
-if (typeof(foswiki) == "undefined") {
+if (typeof(foswiki) === "undefined") {
   foswiki = {};
 }
@@ -34 +34 @@
    * based on the keys descriptor. 
    */
-  function createMember(obj, keys, val) {
+  foswiki.createMember = function(obj, keys, val) {
     var key = keys.shift();
     if (keys.length > 0) {
@@ -42 +42 @@
       }
       // recurse
-      createMember(obj[key], keys, val);
+      foswiki.createMember(obj[key], keys, val);
     } else {
       // store value
@@ -66 +66 @@
       keys = this.name.split(/\./);
       keys.shift(); // take out the first one
-      createMember(foswiki, keys, val);
+      foswiki.createMember(foswiki, keys, val);
     });
   });

trunk/JQueryPlugin/pub/System/JQueryPlugin/plugins/textboxlist/jquery.textboxlist.uncompressed.js

@@ -34 +34 @@
     var self = this, autocompleteOpts;
     self.input = $(elem);
+    elem.textboxList = self;
 
     // build element specific options. 
@@ -164 +165 @@
   $.TextboxLister.prototype.select = function(values, suppressCallback) {
     $.log("TEXTBOXLIST: called select("+values+") "+typeof(values));
-    var self = this, i, j, val, found, currentVal, input, close;
+    var self = this, i, j, val, label, found, currentVal, input, close;
 
     if (typeof(values) === 'object') {
@@ -183 +184 @@
           continue;
         }
-        $.log("val='"+val+"'");
         for (j = 0; j < self.currentValues.length; j++) {
           currentVal = self.currentValues[j];
@@ -213 +213 @@
     self.container.find("."+self.opts.listValueClass).remove();
     for (i = self.currentValues.length-1; i >= 0; i--) {
-      val = self.currentValues[i];
+      val = label = self.currentValues[i];
       if (!val) {
         continue;
       }
+      if (val.match(/^(.+)=(.+)$/)) {
+        val = RegExp.$1;
+        label = RegExp.$2;
+      }
+      $.log("val="+val+" label="+label);
       input = "<input type='hidden' name='"+self.opts.inputName+"' value='"+val+"' />";
       close = $("<a href='#' title='remove "+val+"'></a>").
         addClass(self.opts.closeClass).
-        click(function() {
-          self.deselect.call(self, $(this).parent().find("input").val());
+        click(function(e) {
+          e.preventDefault();
+          self.input.trigger("DeleteValue", $(this).parent().find("input").val());
           return false;
         });
@@ -227 +233 @@
         append(input).
         append(close).
-        append(val).
+        append(label).
         prependTo(self.container);
     }

trunk/JQueryPlugin/pub/System/JQueryPlugin/plugins/treeview/jquery.treeview.uncompressed.css

@@ -128 +128 @@
   display: block;
 }
-
+.treeview .open .placeholder {
+  display:none;
+}
+.treeview .open .placeholder {
+  display:none;
+}