[Zmx-cvs-commit] zmx ZMXScreenClass.as,1.33,1.34

[Steve S. <ssp...@us...>]

Update of /cvsroot/zmx/zmx
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26108

Modified Files:
	ZMXScreenClass.as 
Log Message:
clean up confirm dialog

Index: ZMXScreenClass.as
===================================================================
RCS file: /cvsroot/zmx/zmx/ZMXScreenClass.as,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ZMXScreenClass.as	14 Nov 2004 20:51:09 -0000	1.33
--- ZMXScreenClass.as	29 May 2006 10:47:33 -0000	1.34
***************
*** 180,185 ****
      // Handler for buttons that call XMLRPC methods..  
      //
  
!     _global.gTrace('in doSendXML handler for ' + this + ":" + comp.send_attrs);
  
      var loadURL='';
--- 180,188 ----
      // Handler for buttons that call XMLRPC methods..  
      //
+     // get loadURL, xmlSuccessHandler, xmlFailureHandler from comp
+     // get all other info from 'proxy'
+     //
  
!     _global.gTrace('in doSendXML handler for ' + this + ":" + comp.send_attrs + ":" + comp.loadURL);
  
      var loadURL='';
***************
*** 350,354 ****
      var proxy = [];
      var dt = this[tableInfo.tableName];
-     trace("trying to get checkboxes for: " + tableInfo.tableName + ":" + dt + ":" + this);
      var checkedRow;
      var obj;
--- 353,356 ----
***************
*** 371,375 ****
          }
      }
-     trace("Returning checked rows: " + _global.serializeObject( proxy ));
      return proxy;
  }
--- 373,376 ----
***************
*** 394,397 ****
--- 395,422 ----
  }
  
+ p.confirmWithDialog = function( xmlInfo ) {
+ 
+     if (xmlInfo.confirmAction != null) {
+         _global.gTrace("confirmWithDialog:" + _global.seralizeObject( xmlInfo ));
+         var scrMessage = this.screenMessage( xmlInfo );
+         scrMessage.originalProxy = xmlInfo.proxy;
+         scrMessage.originalComp = xmlInfo.comp;
+     }
+     else {
+         this.checkboxOperationComplete( xmlInfo );
+     }
+ }
+ 
+ p.checkUserConfirmed = function( comp, buttonIndex) {
+     //
+     // close handler for confirmation dialog.
+     //
+     
+     if ((comp.getButtons()[buttonIndex].toUpperCase() == "OK") or (comp.getButtons()[buttonIndex].toUpperCase() == "YES")) {
+         comp.originalProxy.actionConfirmed = 1;
+         this.doSendXML( comp.originalComp, comp.originalProxy );
+     }
+ }
+ 
  p.checkboxOperationComplete = function ( xmlInfo ) {
  
***************
*** 401,405 ****
      this.clearCheckboxes();
      this.refreshControls();
!     if (xmlInfo.message != null) {
          this.screenMessage( xmlInfo );
      }
--- 426,430 ----
      this.clearCheckboxes();
      this.refreshControls();
!     if ((xmlInfo.message != null) || (xmlInfo.Message != null)) {
          this.screenMessage( xmlInfo );
      }