fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-06-26 16:51:24 -04:00
parent d34273d72b 553bf33ae6
commit a0a6e37f97
27 changed files with 218 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/js/stagesmap/core/stagesmap.js
View File

@@ -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 = {