From 590a5d8ce144015896f35e00661870f536759bab Mon Sep 17 00:00:00 2001 From: Herbert Saal Date: Tue, 24 Jun 2014 11:17:37 -0400 Subject: [PATCH 1/2] Add changes stagemap maborak --- workflow/engine/js/stagesmap/core/stagesmap.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/js/stagesmap/core/stagesmap.js b/workflow/engine/js/stagesmap/core/stagesmap.js index da3468888..31322d611 100755 --- a/workflow/engine/js/stagesmap/core/stagesmap.js +++ b/workflow/engine/js/stagesmap/core/stagesmap.js @@ -12,7 +12,7 @@ var stagesmap=function(){ render:{ base:function(xml) { this.panels.editor.loader.hide(); - this.data.db=xml.xmlhttp.responseText.parseJSON().concat({}); + this.data.db=xml.xmlhttp.responseText.parseJSON().concatMaborak({}); if (this.options.rw===true) { this.menu = new this.parent.module.app.menuRight(); this.menu.make({ @@ -433,7 +433,7 @@ stagesmap.prototype={ rw :true, mi :true, hideMenu:true - }.concat(this.options || {}); + }.concatMaborak(this.options || {}); this.options.target = this.parent.dom.element(this.options.target); if(!this.validate()){return false;} this.observers = { From 26c5fa9c3393a1b2effb380707d1b716c25ab518 Mon Sep 17 00:00:00 2001 From: Herbert Saal Date: Mon, 30 Jun 2014 13:11:17 -0400 Subject: [PATCH 2/2] Add change of maborack in tinymce --- .../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js index 5fc17ab32..2bd62e398 100644 --- a/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js +++ b/gulliver/js/tinymce/jscripts/tiny_mce/tiny_mce_src.js @@ -4207,7 +4207,7 @@ tinymce.html.Styles = function(settings, schema) { fi = nodes.length; while (fi--) { // ProcessMaker: conditional statemets created in order to assure the compatibility with maborak - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'){ if (!nodes[fi].parent){ nodes.splice(fi, 1); } @@ -4217,7 +4217,7 @@ tinymce.html.Styles = function(settings, schema) { for (i = 0, l = list.length; i < l; i++){ // ProcessMaker: conditional statemets created in order to assure the compatibility with maborak - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'){ list[i](nodes, name, args); } } @@ -4235,7 +4235,7 @@ tinymce.html.Styles = function(settings, schema) { fi = nodes.length; while (fi--) { // ProcessMaker: conditional statemets created in order to assure the compatibility with maborak - if(list.name!='toStr'&&list.name!='concat'&&list.name!='get_by_key'&&list.name!='expand'&&list.name!='setParent'&&list.name!='isset_key'){ + if(list.name!='toStr'&&list.name!='concatMaborak'&&list.name!='get_by_key'&&list.name!='expand'&&list.name!='setParent'&&list.name!='isset_key'){ // if (!nodes[fi].parent){ nodes.splice(fi, 1); // } @@ -4244,7 +4244,7 @@ tinymce.html.Styles = function(settings, schema) { for (fi = 0, fl = list.callbacks.length; fi < fl; fi++){ // ProcessMaker: conditional statemets created in order to assure the compatibility with maborak - if(list.name!='toStr'&&list.name!='concat'&&list.name!='get_by_key'&&list.name!='expand'&&list.name!='setParent'&&list.name!='isset_key'){ + if(list.name!='toStr'&&list.name!='concatMaborak'&&list.name!='get_by_key'&&list.name!='expand'&&list.name!='setParent'&&list.name!='isset_key'){ list.callbacks[fi](nodes, list.name, args); } } @@ -4384,7 +4384,7 @@ tinymce.html.Writer = function(settings) { for (i = 0, l = attrs.length; i < l; i++) { attr = attrs[i]; - var list = ['toStr', 'concat', 'get_by_key', 'expand', 'setParent', 'isset_key', 'toJSONString', 'tostr', 'setparent', 'tojsonstring']; + var list = ['toStr', 'concatMaborak', 'get_by_key', 'expand', 'setParent', 'isset_key', 'toJSONString', 'tostr', 'setparent', 'tojsonstring']; for(var iList = 0; iList < list.length; iList++) { if( attr.value.indexOf(list[iList]) >= 0 ) { attr.value = attr.value.substring(0, attr.value.indexOf(list[iList])); @@ -4591,12 +4591,12 @@ tinymce.dom = {}; function addEvent(target, name, callback, capture) { if (target.addEventListener) { //conditional statement in order to maintain compatibility with the maborak processmaker library - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ target.addEventListener(name, callback, capture || false); } } else if (target.attachEvent) { //conditional statement in order to maintain compatibility with the maborak processmaker library - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ target.attachEvent('on' + name, callback); } } @@ -4604,11 +4604,11 @@ tinymce.dom = {}; function removeEvent(target, name, callback, capture) { if (target.removeEventListener) { - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ target.removeEventListener(name, callback, capture || false); } } else if (target.detachEvent) { - if(name!='toStr'&&name!='concat'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ + if(name!='toStr'&&name!='concatMaborak'&&name!='get_by_key'&&name!='expand'&&name!='setParent'&&name!='isset_key'&&name!='toJSONString'&&name!='isObject'&&name!='isArray'&&name!='isObjectStrict'){ target.detachEvent('on' + name, callback); } } @@ -8010,7 +8010,7 @@ Sizzle.filter = function( expr, set, inplace, not ) { while ( expr && set.length ) { for ( type in Expr.filter ) { - if(type!='toStr'&&type!='concat'&&type!='get_by_key'&&type!='expand'&&type!='setParent'&&type!='isset_key'&&type!='toJSONString'&&type!='isObject'&&type!='isArray'&&type!='isObjectStrict'){ + if(type!='toStr'&&type!='concatMaborak'&&type!='get_by_key'&&type!='expand'&&type!='setParent'&&type!='isset_key'&&type!='toJSONString'&&type!='isObject'&&type!='isArray'&&type!='isObjectStrict'){ if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { filter = Expr.filter[ type ]; left = match[1];