[Checkins] SVN: z3c.reference/trunk/src/z3c/reference/browser/ revert the dot problem

[Juergen Kartnaller]

Log message for revision 80601:
  revert the dot problem

Changed:
  U   z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js
  U   z3c.reference/trunk/src/z3c/reference/browser/views.py
  U   z3c.reference/trunk/src/z3c/reference/browser/widget.pt
  U   z3c.reference/trunk/src/z3c/reference/browser/widget.py

-=-
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-04 10:51:15 UTC (rev 80600)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js	2007-10-04 11:09:47 UTC (rev 80601)
@@ -26,21 +26,29 @@
 // parameter elementid: input name in which to write into
 // parameter value: formdata string
 function setReferenceInput(name, targetUid, query, title){
-   $j("input[@name="+name+"target]").val(targetUid);
-   $j("input[@name="+name+"formData]").val(query);
-   $j("span[@id="+name+"title]").empty().append(title);
+  var funcName = $j("input[@name="+name+".function]").val();
+  if (!funcName){
+    funcName="defaultSetReferenceInput";
+  }
+  eval(funcName+"('"+name+"', '"+targetUid+"', '"+query+"', '"+title+"')");
+}
 
+function defaultSetReferenceInput(name, targetUid, query, title){
+   $j("input[@name="+name+".target]").val(targetUid);
+   $j("input[@name="+name+".formData]").val(query);
+   $j("span[@id="+name+".title]").empty().append(title);
+
    var a = $j("a[@name="+name+"]");
    var url = a.attr("href");
    url = url.split('?')[0]
-         + '?target=' + $j("input[@name="+name+"target]").val()
-         + '&settingName=' + $j("input[@name="+name+"settingName]").val()
+         + '?target=' + $j("input[@name="+name+".target]").val()
+         + '&settingName=' + $j("input[@name="+name+".settingName]").val()
          + '&name=' + name;
    a.attr('href', url);
 }
 
 
 function getReferenceInputData(name){
-    return $j("input[@name="+name+"formData]").val()
+    return $j("input[@name="+name+".formData]").val()
 }
 

Modified: z3c.reference/trunk/src/z3c/reference/browser/views.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/views.py	2007-10-04 10:51:15 UTC (rev 80600)
+++ z3c.reference/trunk/src/z3c/reference/browser/views.py	2007-10-04 11:09:47 UTC (rev 80601)
@@ -138,7 +138,7 @@
 
     @property
     def spanTitleId(self):
-        return self.prefix + 'title'
+        return self.prefix + '.title'
 
 
 def getEditorView(target, request, settingName):

Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.pt
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.pt	2007-10-04 10:51:15 UTC (rev 80600)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.pt	2007-10-04 11:09:47 UTC (rev 80601)
@@ -1,6 +1,8 @@
 <a href=""
    tal:replace="structure options/linkTag">editor link</a>
 <input type="hidden"
+       tal:replace="structure options/funcInput" />
+<input type="hidden"
        tal:replace="structure options/intidInput" />
 <input type="hidden"
        tal:replace="structure options/formDataInput" />

Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-10-04 10:51:15 UTC (rev 80600)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-10-04 11:09:47 UTC (rev 80601)
@@ -61,6 +61,7 @@
     refTagOnClick=""
     _emptyReference = None
     referenceExplorerViewName = 'viewReferenceEditor.html'
+    functionName = 'defaultSetReferenceInput'
 
     def __init__(self, *args):
         resourcelibrary.need('z3c.reference.parent')
@@ -114,7 +115,7 @@
 
     @property
     def refIdName(self):
-        return self.name +  u'refId'
+        return self.name +  u'.refId'
 
     @property
     def refIdValue(self):
@@ -153,10 +154,17 @@
         openerView.prefix = self.name
         contents = openerView()
 
-        removeName = self.name + 'remove'
-        targetName = self.name + 'target'
-        formDataName = self.name + 'formData'
-        settingNameFieldName = self.name + 'settingName'
+        removeName = self.name + '.remove'
+        targetName = self.name + '.target'
+        formDataName = self.name + '.formData'
+        settingNameFieldName = self.name + '.settingName'
+        functionFieldName=self.name + '.function'
+        funcInput = renderElement(u'input',
+                                   type='hidden',
+                                   name=functionFieldName,
+                                   id=functionFieldName,
+                                   value=self.functionName,
+                                   extra=self.extra)
         intidInput = renderElement(u'input',
                                    type='hidden',
                                    name=targetName,
@@ -184,7 +192,7 @@
         linkTag = renderElement(self.refTag,
                                 href = self.referenceEditorURL,
                                 name=self.name,
-                                id=self.name + 'tag',
+                                id=self.name + '.tag',
                                 onclick=self.refTagOnClick,
                                 cssClass = self.cssClass,
                                 contents=contents,
@@ -197,6 +205,7 @@
                                      value=u'Remove',
                                      )
         return self.template(removeButton=removeButton,
+                             funcInput=funcInput,
                              linkTag=linkTag,
                              intidInput=intidInput,
                              formDataInput=formDataInput,
@@ -218,7 +227,7 @@
         return url
 
     def hasInput(self):
-        return not not self.request.form.get(self.name + 'target')
+        return not not self.request.form.get(self.name + '.target')
 
     def _toFieldValue(self, input):
         if input == self._missing:
@@ -231,8 +240,8 @@
             ref = intIds.getObject(int(refId))
 
         # form field ids
-        formDataName = self.name + 'formData'
-        targetName = self.name + 'target'
+        formDataName = self.name + '.formData'
+        targetName = self.name + '.target'
 
         # get target obj str
         intid = self.request.get(targetName)