[Checkins] SVN: z3c.reference/trunk/src/z3c/reference/browser/ Provide the base js files as a separate resource.

[Juergen Kartnaller]

Log message for revision 80921:
  Provide the base js files as a separate resource.
  Remove the default profile for popupwindow, the a-tag must provide the popup
  settings in the rel attribute.
  

Changed:
  U   z3c.reference/trunk/src/z3c/reference/browser/configure.zcml
  U   z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js
  U   z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js
  U   z3c.reference/trunk/src/z3c/reference/browser/widget.py

-=-
Modified: z3c.reference/trunk/src/z3c/reference/browser/configure.zcml
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/configure.zcml	2007-10-18 12:41:28 UTC (rev 80920)
+++ z3c.reference/trunk/src/z3c/reference/browser/configure.zcml	2007-10-18 13:27:55 UTC (rev 80921)
@@ -25,18 +25,27 @@
       permission="zope.Public"
       provides="..interfaces.IViewReferenceOpener"/>
 
-  <resourceLibrary name="z3c.reference.parent"
+  <resourceLibrary name="z3c.reference.base"
                    require="z3c.javascript.jquery">
       <directory source="resources"
-          include="jquery.popupwindow.js z3c_reference.js parentwindow.css"
+          include="jquery.popupwindow.js jquery.form.js"
           />
   </resourceLibrary>
 
+  <resourceLibrary name="z3c.reference.parent"
+                   require="z3c.javascript.jquery
+                            z3c.reference.base">
+      <directory source="resources"
+          include="z3c_reference.js parentwindow.css"
+          />
+  </resourceLibrary>
+
   <resourceLibrary name="z3c.reference.popup"
                    require="z3c.javascript.jquery
-                            z3c.javascript.swfobject">
+                            z3c.javascript.swfobject
+                            z3c.reference.base">
       <directory source="resources"
-          include="jquery.form.js reference.editor.js popupwindow.css"
+          include="reference.editor.js popupwindow.css"
           />
   </resourceLibrary>
 

Modified: z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js	2007-10-18 12:41:28 UTC (rev 80920)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js	2007-10-18 13:27:55 UTC (rev 80921)
@@ -4,6 +4,9 @@
   (window.opener)
  */
 
+// uses jQuery in noConflict mode to work properly with Mochikit
+var $j = jQuery.noConflict();
+
 var currentTargetUid = -1;
 
 function saveAndClose(){
@@ -12,17 +15,17 @@
     var url = "viewReferenceValidator";
     url += "?settingName="+settingNameStr;
     url += "&target=" + currentTargetUid;
-    var query = $($("form")[0]).formSerialize();
+    var query = $j($j("form")[0]).formSerialize();
     var data = $.ajax({url:url, data:query, async:false}).responseText;
     if (data == 'Ok') {
         // The input is verified and Ok :
-        var title = $("input[@id=form.title]").val();
+        var title = $j("input[@id=form.title]").val();
         window.opener.setReferenceInput(name, currentTargetUid, query, title);
         window.close();
     } else {
         // The input has errors: inject the result with the errors
         var submit_btn = "<input type='button' class='submit' value='save' onclick='saveAndClose()' />";
-        $("#editorEdit").empty().append(data).append(submit_btn);
+        $j("#editorEdit").empty().append(data).append(submit_btn);
     }
 }
 
@@ -30,7 +33,7 @@
     settings = {'settingName': settingNameStr,
                 'target': targetStr}
     $.get("viewReferenceEditorSearch", settings, function (data) {
-            $("#editorSearch").empty().append($(data));
+            $j("#editorSearch").empty().append($j(data));
     });
 }
 
@@ -46,14 +49,14 @@
 
     $.get(url, function (data){
         var submit_btn = "<input type='button' class='submit' value='save' onclick='saveAndClose()' />";
-        $("#editorEdit").empty().append(data).append(submit_btn);
+        $j("#editorEdit").empty().append(data).append(submit_btn);
     });
 }
 
 // initialize on dom ready
-$(document).ready(function(){
+$j(document).ready(function(){
     // load search form
-    if ($("#editorSearch")){
+    if ($j("#editorSearch")){
         loadEditorSearch();
     }
 	

Modified: z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js	2007-10-18 12:41:28 UTC (rev 80920)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js	2007-10-18 13:27:55 UTC (rev 80921)
@@ -3,23 +3,12 @@
   reference editor popup when required.
 */
 
-var profiles = {
-		window:
-		{
-			height:550,
-			width:800,
-			status:0,
-            scrollbars:1,
-            resizable:1
-		}
-	};
-
 // uses jQuery in noConflict mode to work properly with Mochikit
 var $j = jQuery.noConflict();
 
 // bind links to popupwindow function 
 $j(document).ready(function(){
-  $j("a.popupwindow").popupwindow(profiles);
+  $j("a.popupwindow").popupwindow();
 });
 
 // called by popupwindow to write formdata back to opener

Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-10-18 12:41:28 UTC (rev 80920)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-10-18 13:27:55 UTC (rev 80921)
@@ -172,14 +172,15 @@
                                       value = self.context.settingName,
                                       extra=self.extra)
         linkTag = renderElement(self.refTag,
-                                href = self.referenceEditorURL,
-                                name=self.name,
-                                id=self.name + '.tag',
-                                onclick=self.refTagOnClick,
-                                cssClass = self.cssClass,
-                                contents=contents,
-                                style=self.style,
-                                extra=self.extra)
+                        href = self.referenceEditorURL,
+                        name=self.name,
+                        id=self.name + '.tag',
+                        onclick=self.refTagOnClick,
+                        cssClass = self.cssClass,
+                        contents=contents,
+                        style=self.style,
+                        extra = 'rel="height:550,width:800,status:0,scrollbars:1,resizable:1"',
+                        )
         removeButton = renderElement(u'input',
                                      type='submit',
                                      name=removeName,