Item910: adding menu, adding new way of include plugins ( generalized…

… ), fixed dialogAPI general methods declaration git-svn-id: http://svn.foswiki.org/trunk/JQueryCompatibilityModePlugin@2244 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 30, 2009 · 57eabc5 · 57eabc5
1 parent cb5e99b
commit 57eabc5
Show file tree

Hide file tree

Showing 5 changed files with 431 additions and 11 deletions.
diff --git a/lib/Foswiki/Plugins/JQueryCompatibilityModePlugin.pm b/lib/Foswiki/Plugins/JQueryCompatibilityModePlugin.pm
@@ -73,9 +73,8 @@ sub initPlugin {
 	    Foswiki::Func::addToHEAD($jqPluginName."_jq_init",$output,$jqPluginName."_jq");
     }
     _initUITheme();
-    addDialogScripts() if($Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{DialogInclude});
-
-    addAjaxUpload() if($Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{AjaxUploadPlugin});
+    addDialogScripts() if($Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{DialogInclude});    
+    addIncludedPlugins() if($Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{IncludePlugins});
     return 1;
 }
 
@@ -122,8 +121,15 @@ sub _initUITheme {
         Foswiki::Func::addToHEAD($pluginName.'_uithemecss',$output);
     }
 }
-sub addAjaxUpload() {    
+sub addIncludedPlugins() {    
     my $pluginPubHome = Foswiki::Func::getPubUrlPath()."/System/$jqPluginName";
-    my $output = "<script language='javascript' type='text/javascript' src='$pluginPubHome/plugins/jquery.ajax_upload.min.js'></script>";
-    Foswiki::Func::addToHEAD($jqPluginName."_jq_ajax_upload",$output,$jqPluginName."_jq_init");    
+    my @files = split ",",$Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{AutoIncludeFiles};
+
+    # nothing to do. no files to inlcude
+    return if(@files eq 0);
+    foreach my $file ( @files) {        
+            my $output = "<script language='javascript' type='text/javascript' src='$pluginPubHome/$file'></script>";
+            Foswiki::Func::addToHEAD($jqPluginName."_autoinclude_$file",$output,$jqPluginName."_jq_init".",".$jqPluginName."_jqui.dialog");       
+    }
+
 }
diff --git a/lib/Foswiki/Plugins/JQueryCompatibilityModePlugin/Config.spec b/lib/Foswiki/Plugins/JQueryCompatibilityModePlugin/Config.spec
@@ -1,6 +1,6 @@
 # ---+ JQueryCompatibilityModePlugin
-# This is the configuration used by the <b>ToPDFPlugin</b> and the
-# <h2>General</h2>
+# This is the configuration used by the <b>JQueryCompatibilityModePlugin</b> and the
+# <h2>JQuery Core</h2>
 
 # **BOOLEAN**
 # Should the window.Foswiki variable be initilazed
@@ -11,6 +11,7 @@ $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{InitializeFoswikiVar} = 1;
 # auto-include the Jquery-core
 $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{AutoIncludeCore} = 1;
 
+# <h2>JQuery UI</h2>
 # **STRING**
 # JQuery-UI theme name
 $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{UITheme} = "base";
@@ -19,6 +20,7 @@ $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{UITheme} = "base";
 # auto-include JQuery-UI theme
 $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{ThemeInclude} = "1";
 
+# <h2>Foswiki DialogAPI</h2>
 # **BOOLEAN**
 # auto-include JQuery-Dialog api
 $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{DialogInclude} = 0;
@@ -27,10 +29,14 @@ $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{DialogInclude} = 0;
 # auto-include the default settings for DialogAPI? You dont want this if you implemented own dialogs ( and use handlers )
 $Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{DialogDefaultSettingsInclude} = 1;
 
+# <h2>JQuery Plugins</h2>
 # **BOOLEAN**
 # Plugin: should be the ajax-upload-plugin be included?
-$Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{AjaxUploadPlugin} = 0;
+$Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{IncludePlugins} = 0;
 
+# **STRING**
+# All JQuery files to include. A comma seperate list,relativ to pub/System/JQueryCompatibiltyPlugin. 
+$Foswiki::cfg{Plugins}{JQueryCompatibilityModePlugin}{AutoIncludeFiles} = "plugins/jquery.ajax_upload.min.js,plugins/mbMenu.min.js";
 
 
 

diff --git a/pub/System/JQueryCompatibilityModePlugin/foswiki_specific/dialogAPI.js b/pub/System/JQueryCompatibilityModePlugin/foswiki_specific/dialogAPI.js
@@ -20,11 +20,11 @@
 
 /*****************************/
 ;(function($j) {
-window.Foswiki.generalDialogActionHandler = function (selector,data,scriptname,uri) {
+window.generalDialogActionHandler = function (selector,data,scriptname,uri) {
 	$j(selector).html(data);
 }
 
-window.Foswiki.generalActionHandler = function (selector,data,scriptname,uri) {
+window.generalActionHandler = function (selector,data,scriptname,uri) {
 	document.location = uri;	
 }