[Checkins] SVN: z3c.reference/branches/flash/src/z3c/reference/browser/ saving to main window is working now

[Manfred Schwendinger]

Log message for revision 79535:
  saving to main window is working now

Changed:
  U   z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
  U   z3c.reference/branches/flash/src/z3c/reference/browser/resources/z3c_reference.js
  U   z3c.reference/branches/flash/src/z3c/reference/browser/views.py

-=-
Modified: z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js	2007-09-09 12:09:45 UTC (rev 79534)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/resources/reference.editor.js	2007-09-09 12:35:09 UTC (rev 79535)
@@ -1,31 +1,15 @@
-function saveAndClose(){
-	// store view
+/*
+  this file is included in the reference editor popup window and
+  handles the editor and the communication with the main window
+  (window.opener)
+ */
 
+var currentTargetUid = -1;
+
+function saveAndClose(){
     query = $($("form")[0]).formSerialize();
-    alert("save back to main window: \n"+query);
-    window.opener.setInput(name, query);
-	// close popup
+    window.opener.setReferenceInput(name, currentTargetUid, query);
     window.close();
-
-    /*
-    var value = $("input#viewstring").val();
-	eid = name + '.view'
-    window.opener.setInput(eid, value);
-
-	// store title
-    var value = $("input#title").val();
-	eid = name + '.title'
-    window.opener.setInput(eid, value);
-
-	// store description
-    var value = $("input#description").val();
-	eid = name + '.description'
-    window.opener.setInput(eid, value);
-	
-	// close popup
-    window.close();
-    */
-
 }
 
 function loadEditorSearch() {
@@ -40,6 +24,7 @@
 }
 
 function loadEditorEdit(targetStr) {
+    currentTargetUid = targetStr;
     settings = {'settingName': settingNameStr,
                 'target': targetStr,
                 'view': viewStr,

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/resources/z3c_reference.js
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/resources/z3c_reference.js	2007-09-09 12:09:45 UTC (rev 79534)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/resources/z3c_reference.js	2007-09-09 12:35:09 UTC (rev 79535)
@@ -1,3 +1,8 @@
+/*
+  this file is included into the main window. it opens the
+  reference editor popup when required.
+*/
+
 var profiles = {
 		window:
 		{
@@ -20,6 +25,8 @@
 // called by popupwindow to write formdata back to opener
 // parameter elementid: input name in which to write into
 // parameter value: formdata string
-function setInput(elementid, value) {
-    $j("input[@name="+elementid+"]").val(value);
+//function setInput(elementid, value) {
+function setReferenceInput(name, targetUid, query){
+    $j("input[@name="+name+".target]").val(targetUid);
+    $j("input[@name="+name+".formData]").val(query);
 }
\ No newline at end of file

Modified: z3c.reference/branches/flash/src/z3c/reference/browser/views.py
===================================================================
--- z3c.reference/branches/flash/src/z3c/reference/browser/views.py	2007-09-09 12:09:45 UTC (rev 79534)
+++ z3c.reference/branches/flash/src/z3c/reference/browser/views.py	2007-09-09 12:35:09 UTC (rev 79535)
@@ -141,7 +141,7 @@
                 interfaces.IViewReferenceEditorSearch, name=self.settingNameStr)
             if view is not None:
                 return view()
-        return u''
+        return u'Error: unable to load view for %s' % self.settingNameStr
 
 
 def getEditorView(target, request, settingName):