[Checkins] SVN: z3c.reference/trunk/src/z3c/reference/browser/
Removed unused code.
Juergen Kartnaller
juergen at kartnaller.at
Fri Oct 5 10:13:34 EDT 2007
Log message for revision 80649:
Removed unused 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:05:07 UTC (rev 80648)
+++ z3c.reference/trunk/src/z3c/reference/browser/editor.pt 2007-10-05 14:13:33 UTC (rev 80649)
@@ -8,17 +8,11 @@
<script type="text/javascript"
tal:define="name view/name;
settingNameStr view/settingNameStr;
- targetStr view/targetStr;
- viewStr view/viewStr;
- titleStr view/titleStr;
- descriptionStr view/descriptionStr"
+ targetStr view/targetStr"
tal:content="string:
var name = '${name}';
var settingNameStr = '${settingNameStr}';
- var targetStr = '${targetStr}';
- var viewStr = '${viewStr}';
- var titleStr = '${titleStr}';
- var descriptionStr = '${descriptionStr}';">
+ var targetStr = '${targetStr}';">
</script>
</head>
<body>
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:05:07 UTC (rev 80648)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/reference.editor.js 2007-10-05 14:13:33 UTC (rev 80649)
@@ -28,22 +28,21 @@
function loadEditorSearch() {
settings = {'settingName': settingNameStr,
- 'target': targetStr,
- 'view': viewStr,
- 'title': titleStr,
- 'description': descriptionStr}
+ 'target': targetStr}
$.get("viewReferenceEditorSearch", settings, function (data) {
$("#editorSearch").empty().append($(data));
});
}
-function loadEditorEdit(targetStr) {
+function loadEditorEdit(targetStr, extra) {
currentTargetUid = targetStr;
var url = "viewReferenceEditorEdit";
url += "?settingName="+settingNameStr;
url += "&target=" + targetStr;
- url += "&" + window.opener.getReferenceInputData(name);
+ if (extra){
+ url += "&" + extra;
+ }
$.get(url, function (data){
var submit_btn = "<input type='button' class='submit' value='save' onclick='saveAndClose()' />";
@@ -60,6 +59,6 @@
// load edit form
if (targetStr) {
- loadEditorEdit(targetStr);
+ loadEditorEdit(targetStr, window.opener.getReferenceInputData(name));
}
});
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:05:07 UTC (rev 80648)
+++ z3c.reference/trunk/src/z3c/reference/browser/resources/z3c_reference.js 2007-10-05 14:13:33 UTC (rev 80649)
@@ -28,12 +28,12 @@
function setReferenceInput(name, targetUid, query, title){
var funcName = $j("input[@name="+name+".function]").val();
if (!funcName){
- funcName="defaultSetReferenceInput";
+ funcName="DefaultReferenceInput";
}
- eval(funcName+"('"+name+"', '"+targetUid+"', '"+query+"', '"+title+"')");
+ eval("set"+funcName+"('"+name+"', '"+targetUid+"', '"+query+"', '"+title+"')");
}
-function defaultSetReferenceInput(name, targetUid, query, title){
+function setDefaultReferenceInput(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);
@@ -48,6 +48,16 @@
}
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:05:07 UTC (rev 80648)
+++ z3c.reference/trunk/src/z3c/reference/browser/views.py 2007-10-05 14:13:33 UTC (rev 80649)
@@ -46,20 +46,14 @@
"""
name = u''
settingNameStr = u''
- viewStr = u''
targetStr = u''
- titleStr = u''
- descriptionStr = u''
def __call__(self):
resourcelibrary.need('z3c.reference.popup')
"""Setup JS variables."""
self.name = self.request.get('name', u'')
self.settingNameStr = self.request.get('settingName', u'')
- self.viewStr = self.request.get('view', u'')
self.targetStr = self.request.get('target', u'')
- self.titleStr = self.request.get('title', u'')
- self.descriptionStr = self.request.get('description', u'')
return super(ViewReferenceEditor, self).__call__()
@@ -68,10 +62,7 @@
name"""
settingNameStr = u''
- viewStr = u''
targetStr = u''
- titleStr = u''
- descriptionStr = u''
def __init__(self, context, request):
self.context = context
Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.py 2007-10-05 14:05:07 UTC (rev 80648)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.py 2007-10-05 14:13:33 UTC (rev 80649)
@@ -61,7 +61,7 @@
refTagOnClick=""
_emptyReference = None
referenceExplorerViewName = 'viewReferenceEditor.html'
- functionName = 'defaultSetReferenceInput'
+ functionName = 'DefaultReferenceInput'
def __init__(self, *args):
resourcelibrary.need('z3c.reference.parent')
More information about the Checkins
mailing list