Commit 5c505644 authored by Celine Noirot's avatar Celine Noirot
Browse files

Add server url in jflow-browser + Minify with version 2 of uglify ! Correct #171

parent d077c7c1
This diff is collapsed.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
$(".fileDialogDialog .ui-dialog-buttonpane .nbFiles").html(nbFiles + " file" + (nbFiles == 1 ? "" : "s") + " selected."); $(".fileDialogDialog .ui-dialog-buttonpane .nbFiles").html(nbFiles + " file" + (nbFiles == 1 ? "" : "s") + " selected.");
} }
self.exec = function(fillFunction, multiple) { self.exec = function(fillFunction, multiple, serverUrl) {
selectedFiles = []; selectedFiles = [];
$("#fileDialog").remove(); //Remove old instance $("#fileDialog").remove(); //Remove old instance
$("body").append("<div id='fileDialog'>"); $("body").append("<div id='fileDialog'>");
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div>'); </div>');
$(dom + " .modal-body").append("<div id='filetree'>"); $(dom + " .modal-body").append("<div id='filetree'>");
$(dom + " div#filetree").fileTree({ $(dom + " div#filetree").fileTree({
script: '/get_user_files', script: serverUrl+'/get_user_files',
multiSelect: true multiSelect: true
}).on('filetreeclicked', function(e, data) { }).on('filetreeclicked', function(e, data) {
var file = data.li.find("a").attr("rel"); var file = data.li.find("a").attr("rel");
...@@ -108,4 +108,4 @@ ...@@ -108,4 +108,4 @@
}) })
} }
})(window.JflowBrowser = window.JflowWfformRules || {}, window.jQuery); })(window.JflowBrowser = window.JflowWfformRules || {}, window.jQuery);
\ No newline at end of file
...@@ -822,7 +822,7 @@ Handsontable.cellTypes["bootdate"] = Handsontable.BootstrapDateCell; ...@@ -822,7 +822,7 @@ Handsontable.cellTypes["bootdate"] = Handsontable.BootstrapDateCell;
$("#" + tid).val(files.join("\n")); $("#" + tid).val(files.join("\n"));
$("#" + tid).trigger("change"); $("#" + tid).trigger("change");
} }
JflowBrowser.exec(fillInput, params[tid].type.startsWith("inputfiles")); JflowBrowser.exec(fillInput, params[tid].type.startsWith("inputfiles"), $this.options.serverURL);
}); });
} }
//Add handler on urlfile_btn_ on browse file onl //Add handler on urlfile_btn_ on browse file onl
...@@ -956,7 +956,7 @@ Handsontable.cellTypes["bootdate"] = Handsontable.BootstrapDateCell; ...@@ -956,7 +956,7 @@ Handsontable.cellTypes["bootdate"] = Handsontable.BootstrapDateCell;
$this.$element.trigger("change_" + paired[p]); $this.$element.trigger("change_" + paired[p]);
} }
}; };
JflowBrowser.exec(fill_files, true); JflowBrowser.exec(fill_files, true, $this.options.serverURL);
return false; return false;
}) })
......
This diff is collapsed.
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
# sudo ln -s /usr/bin/nodejs /usr/bin/node # sudo ln -s /usr/bin/nodejs /usr/bin/node
# #
# Then, install uglifyJS2 (https://github.com/mishoo/UglifyJS2): # Then, install uglifyJS2 (https://github.com/mishoo/UglifyJS2):
# sudo npm install uglify-js -g # use vesion 2 only: https://github.com/mishoo/UglifyJS2/releases/tag/v2.8.29
# sudo npm install .
uglifyjs --compress --mangle -o jflow.min.js -- jquery.tmpl.min.js jquery.validate.js jquery.ui.widget.js jquery.iframe-transport.js jquery.fileupload.js jquery.fileupload-process.js jquery.fileupload-validate.js cytoscape-2.3.7.js cytoscape.js-panzoom.js dagre.js handsontable.full.min.js jQueryFileTree.min.js jflow-browser.js jflow-activewf.js jflow-availablewf.js jflow-wfoutputs.js jflow-wfform-rules.js jflow-wfform.js jflow-wfstatus.js bootstrap-datepicker.js <path_uglify_V2>/uglifyjs --compress --mangle -o jflow.min.js -- jquery.tmpl.min.js jquery.validate.js jquery.ui.widget.js jquery.iframe-transport.js jquery.fileupload.js jquery.fileupload-process.js jquery.fileupload-validate.js cytoscape-2.3.7.js cytoscape.js-panzoom.js dagre.js handsontable.full.min.js jQueryFileTree.min.js jflow-browser.js jflow-activewf.js jflow-availablewf.js jflow-wfoutputs.js jflow-wfform-rules.js jflow-wfform.js jflow-wfstatus.js bootstrap-datepicker.js
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment