fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename maborak concat funtion in Object.prototype to concatMaborak to avoid name conflicts

Browse Source
This commit is contained in:
herbert
2014-02-26 15:42:12 -04:00
parent 106e4d770b
commit eb5e2c254e
19 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/js/processmap/core/processmap.js
View File

@@ -341,7 +341,7 @@ var processmap=function(){
base:function(xml)
{
this.panels.editor.loader.hide();
this.data.db=xml.xmlhttp.responseText.parseJSON().concat({
this.data.db=xml.xmlhttp.responseText.parseJSON().concatMaborak({
//derivations :["Sequential","Evaluate (manual)","Evaluate (auto)","Parallel (fork)","Parallel by evaluation (fork)","Parallel (join)"],
});
this.data.db.subprocess=[];
@@ -1192,10 +1192,10 @@ var processmap=function(){
//console.log(index);
options_task = {
tp:'task'
}.concat(options_task || {});
}.concatMaborak(options_task || {});
/*var options = {
color:((options_task.tp==='task')?"auto":"green")
}.concat(this.data.db[(options_task.tp=='task')?'task':'subprocess'][index] || {});*/
}.concatMaborak(this.data.db[(options_task.tp=='task')?'task':'subprocess'][index] || {});*/
//var options = this.data.db[(options_task.tp=='task')?'task':'subprocess'][index];
var options = this.data.db['task'][index];
@@ -2227,7 +2227,7 @@ var processmap=function(){
var vars = {
tas_uid:task.uid,
pro_uid:this.options.uid
}.concat((din)?{
}.concatMaborak((din)?{
type : din.type,
next_task: this.data.db.task[din.to].uid
}:{});
@@ -2387,7 +2387,7 @@ processmap.prototype={
mi :true,
ct :false,
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 = {