[Checkins] SVN: z3c.reference/trunk/src/z3c/reference/browser/
clean up code
Juergen Kartnaller
juergen at kartnaller.at
Fri Oct 5 11:06:46 EDT 2007
Log message for revision 80656:
clean up code
Changed:
U z3c.reference/trunk/src/z3c/reference/browser/editor.pt
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/views.py
U z3c.reference/trunk/src/z3c/reference/browser/widget.py
-=-
Modified: z3c.reference/trunk/src/z3c/reference/browser/editor.pt
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/editor.pt 2007-10-05 14:48:06 UTC (rev 80655)
+++ z3c.reference/trunk/src/z3c/reference/browser/editor.pt 2007-10-05 15:06:45 UTC (rev 80656)
@@ -8,20 +8,21 @@
<script type="text/javascript"
tal:define="name view/name;
settingNameStr view/settingNameStr;
- targetStr view/targetStr"
+ targetStr view/targetStr;
+ formdata view/formdata"
tal:content="string:
var name = '${name}';
var settingNameStr = '${settingNameStr}';
- var targetStr = '${targetStr}';">
+ var targetStr = '${targetStr}';
+ var formdata = '${formdata}'">
</script>
</head>
<body>
<div id="editorSearch">
</div>
-
<form>
- <div id="editorEdit">
- </div>
+ <div id="editorEdit">
+ </div>
</form>
</body>
</html>
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-05 14:48:06 UTC (rev 80655)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js 2007-10-05 15:06:45 UTC (rev 80656)
@@ -59,6 +59,6 @@
// load edit form
if (targetStr) {
- loadEditorEdit(targetStr, window.opener.getReferenceInputData(name));
+ loadEditorEdit(targetStr, formdata);
}
});
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-05 14:48:06 UTC (rev 80655)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js 2007-10-05 15:06:45 UTC (rev 80656)
@@ -28,9 +28,9 @@
function setReferenceInput(name, targetUid, query, title){
var funcName = $j("input[@name="+name+".function]").val();
if (!funcName){
- funcName="DefaultReferenceInput";
+ funcName="setDefaultReferenceInput";
}
- eval("set"+funcName+"('"+name+"', '"+targetUid+"', '"+query+"', '"+title+"')");
+ eval(funcName+"('"+name+"', '"+targetUid+"', '"+query+"', '"+title+"')");
}
function setDefaultReferenceInput(name, targetUid, query, title){
@@ -43,21 +43,8 @@
url = url.split('?')[0]
+ '?target=' + $j("input[@name="+name+".target]").val()
+ '&settingName=' + $j("input[@name="+name+".settingName]").val()
- + '&name=' + name;
+ + '&name=' + name
+ + '&formdata=' + encodeURIComponent($j("input[@name="+name+".formData]").val());
a.attr('href', url);
}
-function getReferenceInputData(name){
- var funcName = $j("input[@name="+name+".function]").val();
- if (!funcName){
- funcName="DefaultReferenceInput";
- }
- var res;
- eval('res=get'+funcName+"('"+name+"')");
- return res;
-}
-
-function getDefaultReferenceInput(name){
- 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-05 14:48:06 UTC (rev 80655)
+++ z3c.reference/trunk/src/z3c/reference/browser/views.py 2007-10-05 15:06:45 UTC (rev 80656)
@@ -47,6 +47,7 @@
name = u''
settingNameStr = u''
targetStr = u''
+ formdata = u''
def __call__(self):
resourcelibrary.need('z3c.reference.popup')
@@ -54,6 +55,7 @@
self.name = self.request.get('name', u'')
self.settingNameStr = self.request.get('settingName', u'')
self.targetStr = self.request.get('target', u'')
+ self.formdata = self.request.get('formdata', u'')
return super(ViewReferenceEditor, self).__call__()
Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.py 2007-10-05 14:48:06 UTC (rev 80655)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.py 2007-10-05 15:06:45 UTC (rev 80656)
@@ -74,7 +74,9 @@
self.referenceExplorerViewName,
urllib.urlencode({'settingName' : self.context.settingName,
'target' : self.targetValue,
- 'name': self.name}))
+ 'name': self.name,
+ 'formdata': self.formDataValue,
+ }))
@property
def formDataValue(self):
@@ -129,15 +131,6 @@
refId = u''
return refId
- @property
- def titleValue(self):
- """Returns the reference title."""
- current = self._getCurrentValue()
- if current and current.title:
- return current.title or u''
- else:
- return u''
-
def __call__(self):
resourcelibrary.need('z3c.reference.parent')
if self._renderedValueSet():
More information about the Checkins
mailing list