Adding TActiveButton and TActiveTextBox

4 files changed, 43 insertions, 261 deletions

diff --git a/framework/Web/Javascripts/extra/behaviour.js b/framework/Web/Javascripts/extra/behaviour.js
deleted file mode 100644
index ac9adeda..00000000
--- a/framework/Web/Javascripts/extra/behaviour.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

-   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work

-   of Simon Willison (see comments by Simon below).

-

-   Description:

-   	

-   	Uses css selectors to apply javascript behaviours to enable

-   	unobtrusive javascript in html documents.

-   	

-   Usage:   

-   

-	var myrules = {

-		'b.someclass' : function(element){

-			element.onclick = function(){

-				alert(this.innerHTML);

-			}

-		},

-		'#someid u' : function(element){

-			element.onmouseover = function(){

-				this.innerHTML = "BLAH!";

-			}

-		}

-	};

-	

-	Behaviour.register(myrules);

-	

-	// Call Behaviour.apply() to re-apply the rules (if you

-	// update the dom, etc).

-

-   License:

-   

-   	This file is entirely BSD licensed.

-   	

-   More information:

-   	

-   	http://ripcord.co.nz/behaviour/

-   

-*/   

-

-var Behaviour = {

-	list : new Array,

-	

-	register : function(sheet){

-		Behaviour.list.push(sheet);

-	},

-	

-	start : function(){

-		Event.OnLoad(Behaviour.apply);

-	},

-	

-	apply : function(){

-		for (h=0;sheet=Behaviour.list[h];h++){

-			for (selector in sheet){

-				list = document.getElementsBySelector(selector);

-				

-				if (!list){

-					continue;

-				}

-

-				for (i=0;element=list[i];i++){

-					sheet[selector](element);

-				}

-			}

-		}

-	}

-}

-

-Behaviour.start();
\ No newline at end of file
diff --git a/framework/Web/Javascripts/extra/getElementsBySelector.js b/framework/Web/Javascripts/extra/getElementsBySelector.js
deleted file mode 100644
index 592872fc..00000000
--- a/framework/Web/Javascripts/extra/getElementsBySelector.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/** document.getElementsBySelector(selector)

-   - returns an array of element objects from the current document

-     matching the CSS selector. Selectors can contain element names, 

-     class names and ids and can be nested. For example:

-     

-       elements = document.getElementsBySelect('div#main p a.external')

-     

-     Will return an array of all 'a' elements with 'external' in their 

-     class attribute that are contained inside 'p' elements that are 

-     contained inside the 'div' element which has id="main"

-

-   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:

-   See http://www.w3.org/TR/css3-selectors/#attribute-selectors

-

-   Version 0.4 - Simon Willison, March 25th 2003

-   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows

-   -- Opera 7 fails 

-*/

-

-/** 

- * Returns all children of element. Workaround required for IE5/Windo

- */

-function getAllChildren(e) {

-  // Returns all children of element. Workaround required for IE5/Windows. Ugh.

-  return e.all ? e.all : e.getElementsByTagName('*');

-}

-

-/** 

- * returns an array of element objects from the current document

-     matching the CSS selector. Selectors can contain element names, 

-     class names and ids and can be nested. For example:

-     

-     <pre><tt>elements = $CSS('div#main p a.external')</tt></pre>

-     

-     Will return an array of all 'a' elements with 'external' in their 

-     class attribute that are contained inside 'p' elements that are 

-     contained inside the 'div' element which has id="main"

- */

-$CSS = function(selector) {

-  // Attempt to fail gracefully in lesser browsers

-  if (!document.getElementsByTagName) {

-    return new Array();

-  }

-  // Split selector in to tokens

-  var tokens = selector.split(' ');

-  var currentContext = new Array(document);

-  for (var i = 0; i < tokens.length; i++) {

-    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;

-    if (token.indexOf('#') > -1) {

-      // Token is an ID selector

-      var bits = token.split('#');

-      var tagName = bits[0];

-      var id = bits[1];

-      var element = document.getElementById(id);

-      if (tagName && element.nodeName.toLowerCase() != tagName) {

-        // tag with that ID not found, return false

-        return new Array();

-      }

-      // Set currentContext to contain just this element

-      currentContext = new Array(element);

-      continue; // Skip to next token

-    }

-    if (token.indexOf('.') > -1) {

-      // Token contains a class selector

-      var bits = token.split('.');

-      var tagName = bits[0];

-      var className = bits[1];

-      if (!tagName) {

-        tagName = '*';

-      }

-      // Get elements matching tag, filter them for class selector

-      var found = new Array;

-      var foundCount = 0;

-      for (var h = 0; h < currentContext.length; h++) {

-        var elements;

-        if (tagName == '*') {

-            elements = getAllChildren(currentContext[h]);

-        } else {

-            elements = currentContext[h].getElementsByTagName(tagName);

-        }

-        for (var j = 0; j < elements.length; j++) {

-          found[foundCount++] = elements[j];

-        }

-      }

-      currentContext = new Array;

-      var currentContextIndex = 0;

-      for (var k = 0; k < found.length; k++) {

-        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {

-          currentContext[currentContextIndex++] = found[k];

-        }

-      }

-      continue; // Skip to next token

-    }

-    // Code to deal with attribute selectors

-    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {

-      var tagName = RegExp.$1;

-      var attrName = RegExp.$2;

-      var attrOperator = RegExp.$3;

-      var attrValue = RegExp.$4;

-      if (!tagName) {

-        tagName = '*';

-      }

-      // Grab all of the tagName elements within current context

-      var found = new Array;

-      var foundCount = 0;

-      for (var h = 0; h < currentContext.length; h++) {

-        var elements;

-        if (tagName == '*') {

-            elements = getAllChildren(currentContext[h]);

-        } else {

-            elements = currentContext[h].getElementsByTagName(tagName);

-        }

-        for (var j = 0; j < elements.length; j++) {

-          found[foundCount++] = elements[j];

-        }

-      }

-      currentContext = new Array;

-      var currentContextIndex = 0;

-      var checkFunction; // This function will be used to filter the elements

-      switch (attrOperator) {

-        case '=': // Equality

-          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };

-          break;

-        case '~': // Match one of space seperated words 

-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };

-          break;

-        case '|': // Match start with value followed by optional hyphen

-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };

-          break;

-        case '^': // Match starts with value

-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };

-          break;

-        case '$': // Match ends with value - fails with "Warning" in Opera 7

-          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };

-          break;

-        case '*': // Match ends with value

-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };

-          break;

-        default :

-          // Just test for existence of attribute

-          checkFunction = function(e) { return e.getAttribute(attrName); };

-      }

-      currentContext = new Array;

-      var currentContextIndex = 0;

-      for (var k = 0; k < found.length; k++) {

-        if (checkFunction(found[k])) {

-          currentContext[currentContextIndex++] = found[k];

-        }

-      }

-      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);

-      continue; // Skip to next token

-    }

-    // If we get here, token is JUST an element (not a class or ID selector)

-    tagName = token;

-    var found = new Array;

-    var foundCount = 0;

-    for (var h = 0; h < currentContext.length; h++) {

-      var elements = currentContext[h].getElementsByTagName(tagName);

-      for (var j = 0; j < elements.length; j++) {

-        found[foundCount++] = elements[j];

-      }

-    }

-    currentContext = found;

-  }

-  return currentContext;

-}

-

-/* That revolting regular expression explained 

-/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/

-  \---/  \---/\-------------/    \-------/

-    |      |         |               |

-    |      |         |           The value

-    |      |    ~,|,^,$,* or =

-    |   Attribute 

-   Tag

-*/

diff --git a/framework/Web/Javascripts/js/ajax.js b/framework/Web/Javascripts/js/ajax.js
index a9d0fd73..e082c7bb 100644
--- a/framework/Web/Javascripts/js/ajax.js
+++ b/framework/Web/Javascripts/js/ajax.js
@@ -44,8 +44,9 @@ method.toFunction().apply(this,command[method].concat(transport));else if(typeof
 {Logger.error("Error in executing callback response:","Unable to find HTML element with ID '"+id+"' before executing "+method+"().");}}}},Exception:{"on500":function(request,transport,data)
 {var e=request.getHeaderData(Prado.CallbackRequest.ERROR_HEADER);Logger.error("Callback Server Error "+e.code,this.formatException(e));},'on200':function(request,transport,data)
 {if(transport.status<500)
-{var msg='HTTP '+transport.status+" with response : \n";msg+=transport.responseText+"\n";msg+="Data : \n"+inspect(data)+"\n";msg+="Actions : \n";request.getHeaderData(Prado.CallbackRequest.ACTION_HEADER).each(function(action)
-{msg+=inspect(action)+"\n";})
+{var msg='HTTP '+transport.status+" with response : \n";msg+=transport.responseText+"\n";msg+="Data : \n"+inspect(data)+"\n";msg+="Actions : \n";data=request.getHeaderData(Prado.CallbackRequest.ACTION_HEADER);if(data&&data.length>0)
+{data.each(function(action)
+{msg+=inspect(action)+"\n";});}
 Logger.warn(msg);}},onException:function(request,e)
 {msg="";for(var v in e)
 {if(typeof(v[e])!="object"&&typeof(v[e])!="function")
@@ -62,18 +63,22 @@ return null;},dispatchPriorityRequest:function(callback)
 this.abortRequestInProgress();callback.request=new Ajax.Request(callback.url,callback.options);callback.timeout=setTimeout(function()
 {Logger.warn("priority timeout");Prado.CallbackRequest.abortRequestInProgress();},callback.options.RequestTimeOut);this.requestInProgress=callback;Logger.info("dispatched "+this.requestInProgress)},dispatchNormalRequest:function(callback)
 {Logger.info("dispatching normal request");new Ajax.Request(callback.url,callback.options);},abortRequestInProgress:function()
-{inProgress=Prado.CallbackRequest.requestInProgress;if(inProgress)
+{inProgress=Prado.CallbackRequest.requestInProgress;Logger.info("aborting ... "+inProgress);if(inProgress)
 {Logger.warn("aborted "+inProgress.id)
-inProgress.request.transport.abort();clearTimeout(inProgress.timeout);Prado.CallbackRequest.requestInProgress=null;}},updatePageState:function(request,transport)
+inProgress.request.transport.abort();clearTimeout(inProgress.timeout);Prado.CallbackRequest.requestInProgress=null;return true;}
+return false;},updatePageState:function(request,transport)
 {pagestate=$(this.FIELD_CALLBACK_PAGESTATE);if(request.options.EnablePageStateUpdate&&request.options.HasPriority&&pagestate)
-{Logger.warn("updating page state");pagestate.value=request.header(this.PAGESTATE_HEADER);}}})
+{data=request.header(this.PAGESTATE_HEADER);if(typeof(data)=="string"&&data.length>0)
+{Logger.warn("updating page state");pagestate.value=data;}
+else
+{Logger.debug("Bad page state:"+data);}}}})
 Ajax.Responders.register({onComplete:function(request)
 {if(request.options.HasPriority)
 Prado.CallbackRequest.abortRequestInProgress();}});Event.OnLoad(function()
 {if(typeof Logger!="undefined")
 Ajax.Responders.register(Prado.CallbackRequest.Exception);});Prado.CallbackRequest.prototype={url:window.location.href,options:{},id:null,request:null,initialize:function(id,options)
-{this.id=id;this.options={RequestTimeOut:30000,EnablePageStateUpdate:true,HasPriority:true,CausesValidation:true,ValidationGroup:null,PostInputs:true,postBody:this._getPostData(),parameters:''}
-Object.extend(this.options,options||{});if(this.options.CausesValidation&&typeof(Prado.Validation)!="undefined")
+{this.id=id;this.options={RequestTimeOut:30000,EnablePageStateUpdate:true,HasPriority:true,CausesValidation:true,ValidationGroup:null,PostInputs:true}
+Object.extend(this.options,options||{});Object.extend(this.options,{postBody:this._getPostData(),parameters:''});if(this.options.CausesValidation&&typeof(Prado.Validation)!="undefined")
 {var form=this.options.Form||Prado.Validation.getForm();if(Prado.Validation.validate(form,this.options.ValidationGroup,this)==false)
 return;}
 if(this.options.HasPriority)
@@ -127,4 +132,5 @@ break;case'n':if(next()=='u'&&next()=='l'&&next()=='l'){next();return null;}
 break;}
 error("Syntax error");}
 function value(){white();switch(ch){case'{':return object();case'[':return array();case'"':return string();case'-':return number();default:return ch>='0'&&ch<='9'?number():word();}}
-return value();}};
\ No newline at end of file
+return value();}};Prado.WebUI.CallbackControl=Class.extend(Prado.WebUI.PostBackControl,{onPostBack:function(event,options)
+{new Prado.CallbackRequest(options.EventTarget,options);Event.stop(event);}});Prado.WebUI.TActiveButton=Class.extend(Prado.WebUI.CallbackControl);
\ No newline at end of file
diff --git a/framework/Web/Javascripts/prado/ajax3.js b/framework/Web/Javascripts/prado/ajax3.js
index 15f60631..b21e9429 100644
--- a/framework/Web/Javascripts/prado/ajax3.js
+++ b/framework/Web/Javascripts/prado/ajax3.js
@@ -167,10 +167,14 @@ Object.extend(Prado.CallbackRequest,
 				msg += transport.responseText + "\n";

 				msg += "Data : \n"+inspect(data)+"\n";

 				msg += "Actions : \n";

-				request.getHeaderData(Prado.CallbackRequest.ACTION_HEADER).each(function(action)

+				data = request.getHeaderData(Prado.CallbackRequest.ACTION_HEADER);

+				if(data && data.length > 0)

 				{

-					msg += inspect(action)+"\n";

-				})

+					data.each(function(action)

+					{

+						msg += inspect(action)+"\n";

+					});

+				}

 				Logger.warn(msg);

 			}

 		},

@@ -262,13 +266,16 @@ Object.extend(Prado.CallbackRequest,
 	abortRequestInProgress : function()

 	{

 		inProgress = Prado.CallbackRequest.requestInProgress;

+		Logger.info("aborting ... "+inProgress);

 		if(inProgress)

 		{

 			Logger.warn("aborted "+inProgress.id)

 			inProgress.request.transport.abort();

 			clearTimeout(inProgress.timeout);

 			Prado.CallbackRequest.requestInProgress = null;

+			return true;

 		}

+		return false;

 	},

 	

 	/**

@@ -280,8 +287,16 @@ Object.extend(Prado.CallbackRequest,
 		pagestate = $(this.FIELD_CALLBACK_PAGESTATE);

 		if(request.options.EnablePageStateUpdate && request.options.HasPriority && pagestate)

 		{

-			Logger.warn("updating page state");

-			pagestate.value = request.header(this.PAGESTATE_HEADER);

+			data = request.header(this.PAGESTATE_HEADER);

+			if(typeof(data) == "string" && data.length > 0)

+			{

+				Logger.warn("updating page state");

+				pagestate.value = data;

+			}

+			else

+			{

+				Logger.debug("Bad page state:"+data);

+			}

 		}

 	}

 })

@@ -341,12 +356,17 @@ Prado.CallbackRequest.prototype =
 			HasPriority : true,

 			CausesValidation : true,

 			ValidationGroup : null,

-			PostInputs : true,

-			postBody : this._getPostData(),

-			parameters : ''

+			PostInputs : true

 		}

 		Object.extend(this.options, options || {});

-				

+		

+		//override parameter and postBody options.

+		Object.extend(this.options, 

+		{

+			postBody : this._getPostData(),

+			parameters : ''			

+		});

+

 		if(this.options.CausesValidation && typeof(Prado.Validation) != "undefined")

 		{

 			var form =  this.options.Form || Prado.Validation.getForm();