summaryrefslogtreecommitdiffstats
path: root/codebase/connector.js
diff options
context:
space:
mode:
authorStanislav-Wolski <stanislau.wolski@gmail.com>2012-06-20 15:28:03 +0300
committerStanislav-Wolski <stanislau.wolski@gmail.com>2012-06-20 15:28:03 +0300
commitaa34a3cddf3d1948763f4c89bbb40400465e2a12 (patch)
treebd4dbd18c2620a3611ac4c7b0fad6fa5acc1a664 /codebase/connector.js
parent240c536db9e329211965691edfe0ea38a512e23a (diff)
downloadconnector-php-aa34a3cddf3d1948763f4c89bbb40400465e2a12.zip
connector-php-aa34a3cddf3d1948763f4c89bbb40400465e2a12.tar.gz
connector-php-aa34a3cddf3d1948763f4c89bbb40400465e2a12.tar.bz2
[fix] infinite self-reccurence in case of double including connector.jsv1.5
Diffstat (limited to 'codebase/connector.js')
-rw-r--r--codebase/connector.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/codebase/connector.js b/codebase/connector.js
index c89a654..6192db6 100644
--- a/codebase/connector.js
+++ b/codebase/connector.js
@@ -2,7 +2,7 @@
@author dhtmlx.com
@license GPL, see license.txt
*/
-if (window.dhtmlXGridObject){
+if (window.dhtmlXGridObject && !dhtmlXGridObject.prototype._init_point_connector){
dhtmlXGridObject.prototype._init_point_connector=dhtmlXGridObject.prototype._init_point;
dhtmlXGridObject.prototype._init_point=function(){
//make separate config array for each grid
@@ -120,7 +120,7 @@ if (window.dhtmlXGridObject){
if (this._con_f_used[f*1])
this._con_f_used[f*1]=v;
- };
+ }
this._colls_loaded=true;
}
};
@@ -130,7 +130,7 @@ if (window.dhtmlXGridObject){
}
-if (window.dataProcessor){
+if (window.dataProcessor && !dataProcessor.prototype.init_original){
dataProcessor.prototype.init_original=dataProcessor.prototype.init;
dataProcessor.prototype.init=function(obj){
this.init_original(obj);
@@ -139,7 +139,7 @@ if (window.dataProcessor){
this.setTransactionMode("POST",true);
this.serverProcessor+=(this.serverProcessor.indexOf("?")!=-1?"&":"?")+"editing=true";
};
-};
+}
dhtmlxError.catchError("LoadXML",function(a,b,c){
alert(c[0].responseText);
});