diff --git a/WebAPP/App/Controller/AddCase.js b/WebAPP/App/Controller/AddCase.js index e3e542e1c..aba14500c 100644 --- a/WebAPP/App/Controller/AddCase.js +++ b/WebAPP/App/Controller/AddCase.js @@ -211,7 +211,7 @@ export default class AddCase { event.preventDefault(); event.stopImmediatePropagation(); - Message.loaderStart('Saving model data') + Message.loaderStart('Saving model data...') var casename = $("#osy-casename").val().trim(); var desc = $("#osy-desc").val().trim(); @@ -964,7 +964,7 @@ export default class AddCase { if(model.caserunByScenario[model.scenarios[id]['ScenarioId']].length != 0){ Message.bigBoxDanger('Alert', `You cannot delete this scenario. It is used in ${model.caserunByScenario[model.scenarios[id]['ScenarioId']]} caserun(s)! - Plese reomve these scenario from caseruns before deletion.`, null) + Please remove this scenario from caseruns before deletion.`, null) } else{ let scId = model.scenarios[id]['ScenarioId']; diff --git a/WebAPP/App/Controller/DataFile.js b/WebAPP/App/Controller/DataFile.js index d34f2c7e5..0552601cc 100644 --- a/WebAPP/App/Controller/DataFile.js +++ b/WebAPP/App/Controller/DataFile.js @@ -116,7 +116,7 @@ export default class DataFile { $("#osy-logFile").off('click'); $("#osy-logFile").on('click', function (event) { - Message.loaderStart('Generating log file!') + Message.loaderStart('Generating log file...') Osemosys.readLogFile() .then(response => { Message.loaderEnd(); @@ -435,7 +435,7 @@ export default class DataFile { $("#osy-generateDataFile").off('click'); $("#osy-generateDataFile").on('click', function (event) { Pace.restart(); - Message.loaderStart('Generating data file!') + Message.loaderStart('Generating data file...') Osemosys.generateDataFile(model.casename, model.cs) .then(response => { if (response.status_code == "success") { @@ -480,7 +480,7 @@ export default class DataFile { $("#osy-run").off('click'); $("#osy-run").on('click', function (event) { Pace.restart(); - Message.loaderStart('Optimization in process!') + Message.loaderStart('Optimization in process...') // const logBox = document.getElementById("logBox"); @@ -690,7 +690,7 @@ export default class DataFile { buttons: '[No][Yes]' }, function (ButtonPressed) { if (ButtonPressed === "Yes") { - Message.loaderStart('Deleteing case data...'); + Message.loaderStart('Deleting case data...'); Base.deleteCaseRun(model.casename, caserunname, false) .then(response => { Message.clearMessages(); @@ -780,7 +780,7 @@ export default class DataFile { buttons: '[No][Yes]' }, function (ButtonPressed) { if (ButtonPressed === "Yes") { - Message.loaderStart('Deleteing case results...'); + Message.loaderStart('Deleting case results...'); Base.deleteCaseRun(model.casename, caserunname, true) .then(response => { Message.clearMessages(); @@ -872,7 +872,7 @@ export default class DataFile { $("#osy-batchRun").on('click', function (event) { //console.log('BATCH RUN') Pace.restart(); - Message.loaderStart('BATCH RUN! Plese wait...'); + Message.loaderStart('BATCH RUN! Please wait...'); let batchRunCases = []; $("input:checkbox[name=type]:checked").each(function(){ @@ -919,7 +919,7 @@ export default class DataFile { $("#osy-cleanUp").on('click', function (event) { //console.log('BATCH RUN') Pace.restart(); - Message.loaderStart('Recycle all results! Plese wait...'); + Message.loaderStart('Recycle all results! Please wait...'); Osemosys.cleanUp(model.casename) .then(response => { diff --git a/WebAPP/App/Controller/ModelFile.js b/WebAPP/App/Controller/ModelFile.js index 66425a0be..d59866f83 100644 --- a/WebAPP/App/Controller/ModelFile.js +++ b/WebAPP/App/Controller/ModelFile.js @@ -134,7 +134,7 @@ export default class ModelFile {
"+F+"
","makePredByNodeName":f,"isEditable":b,"isControlSizing":e,"isText":g,"isElement":h,"isVoid":i,"isPara":j,"isPurePara":r,"isHeading":k,"isInline":t,"isBlock":c.not(t),"isBodyInline":B,"isBody":C,"isParaInline":A,"isPre":l,"isList":u,"isTable":s,"isCell":w,"isBlockquote":x,"isBodyContainer":y,"isAnchor":z,"isDiv":f("DIV"),"isLi":q,"isBR":f("BR"),"isSpan":f("SPAN"),"isB":f("B"),"isU":f("U"),"isS":f("S"),"isI":f("I"),"isImg":f("IMG"),"isTextarea":ta,"isEmpty":H,"isEmptyAnchor":c.and(z,H),"isClosestSibling":D,"withClosestSiblings":E,"nodeLength":G,"isLeftEdgePoint":U,"isRightEdgePoint":V,"isEdgePoint":W,"isLeftEdgeOf":X,"isRightEdgeOf":Y,"isLeftEdgePointOf":Z,"isRightEdgePointOf":$,"prevPoint":ba,"nextPoint":ca,"isSamePoint":da,"isVisiblePoint":ea,"prevPointUntil":fa,"nextPointUntil":ga,"isCharPoint":ha,"walkPoint":ia,"ancestor":J,"singleChildAncestor":K,"listAncestor":L,"lastAncestor":M,"listNext":P,"listPrev":O,"listDescendant":Q,"commonAncestor":N,"wrap":R,"insertAfter":S,"appendChildNodes":T,"position":_,"hasChildren":aa,"makeOffsetPath":ja,"fromOffsetPath":ka,"splitTree":ma,"splitPoint":na,"create":oa,"createText":pa,"remove":qa,"removeWhile":ra,"replace":sa,"html":va,"value":ua,"posFromPlaceholder":wa,"attachEvents":xa,"detachEvents":ya}}(),q=function(b,e){var f=this,g=a.summernote.ui;return this.memos={},this.modules={},this.layoutInfo={},this.options=e,this.initialize=function(){return this.layoutInfo=g.createLayout(b,e),this._initialize(),b.hide(),this},this.destroy=function(){this._destroy(),b.removeData("summernote"),g.removeLayout(b,this.layoutInfo)},this.reset=function(){var a=f.isDisabled();this.code(p.emptyPara),this._destroy(),this._initialize(),a&&f.disable()},this._initialize=function(){var b=a.extend({},this.options.buttons);Object.keys(b).forEach(function(a){f.memo("button."+a,b[a])});var c=a.extend({},this.options.modules,a.summernote.plugins||{});Object.keys(c).forEach(function(a){f.module(a,c[a],!0)}),Object.keys(this.modules).forEach(function(a){f.initializeModule(a)})},this._destroy=function(){Object.keys(this.modules).reverse().forEach(function(a){f.removeModule(a)}),Object.keys(this.memos).forEach(function(a){f.removeMemo(a)})},this.code=function(a){var c=this.invoke("codeview.isActivated");return void 0===a?(this.invoke("codeview.sync"),c?this.layoutInfo.codable.val():this.layoutInfo.editable.html()):(c?this.layoutInfo.codable.val(a):this.layoutInfo.editable.html(a),b.val(a),this.triggerEvent("change",a),void 0)},this.isDisabled=function(){return"false"===this.layoutInfo.editable.attr("contenteditable")},this.enable=function(){this.layoutInfo.editable.attr("contenteditable",!0),this.invoke("toolbar.activate",!0)},this.disable=function(){this.invoke("codeview.isActivated")&&this.invoke("codeview.deactivate"),this.layoutInfo.editable.attr("contenteditable",!1),this.invoke("toolbar.deactivate",!0)},this.triggerEvent=function(){var a=d.head(arguments),e=d.tail(d.from(arguments)),f=this.options.callbacks[c.namespaceToCamel(a,"on")];f&&f.apply(b[0],e),b.trigger("summernote."+a,e)},this.initializeModule=function(a){var d=this.modules[a];d.shouldInitialize=d.shouldInitialize||c.ok,d.shouldInitialize()&&(d.initialize&&d.initialize(),d.events&&p.attachEvents(b,d.events))},this.module=function(a,b,c){return 1===arguments.length?this.modules[a]:(this.modules[a]=new b(this),void(c||this.initializeModule(a)))},this.removeModule=function(a){var c=this.modules[a];c.shouldInitialize()&&(c.events&&p.detachEvents(b,c.events),c.destroy&&c.destroy()),delete this.modules[a]},this.memo=function(a,b){return 1===arguments.length?this.memos[a]:void(this.memos[a]=b)},this.removeMemo=function(a){this.memos[a]&&this.memos[a].destroy&&this.memos[a].destroy(),delete this.memos[a]},this.createInvokeHandler=function(b,c){return function(d){d.preventDefault(),f.invoke(b,c||a(d.target).closest("[data-value]").data("value"))}},this.invoke=function(){var a=d.head(arguments),b=d.tail(d.from(arguments)),c=a.split("."),e=c.length>1,f=e&&d.head(c),g=e?d.last(c):d.head(c),h=this.modules[f||"editor"];return!f&&this[g]?this[g].apply(this,b):h&&h[g]&&h.shouldInitialize()?h[g].apply(h,b):void 0},this.initialize()};a.fn.extend({"summernote":function(){var b=a.type(d.head(arguments)),c="string"===b,e="object"===b,f=e?d.head(arguments):{};f=a.extend({},a.summernote.options,f),f.langInfo=a.extend(!0,{},a.summernote.lang["en-US"],a.summernote.lang[f.lang]),this.each(function(b,c){var d=a(c);if(!d.data("summernote")){var e=new q(d,f);d.data("summernote",e),d.data("summernote").triggerEvent("init",e.layoutInfo)}});var g=this.first();if(g.length){var h=g.data("summernote");if(c)return h.invoke.apply(h,d.from(arguments));f.focus&&h.invoke("editor.focus")}return this}});var r=function(b,c,d,e){this.render=function(f){var g=a(b);if(d&&d.contents&&g.html(d.contents),d&&d.className&&g.addClass(d.className),d&&d.data&&a.each(d.data,function(a,b){g.attr("data-"+a,b)}),d&&d.click&&g.on("click",d.click),c){var h=g.find(".note-children-container");c.forEach(function(a){a.render(h.length?h:g)})}return e&&e(g,d),d&&d.callback&&d.callback(g),f&&f.append(g),g}},s={"create":function(b,c){return function(){var d=a.isArray(arguments[0])?arguments[0]:[],e="object"==typeof arguments[1]?arguments[1]:arguments[0];return e&&e.children&&(d=e.children),new r(b,d,e,c)}}},t=s.create(''),u=s.create(''),v=s.create(''),w=s.create(''),x=s.create(''),y=s.create(['"].join("")),z=s.create(''),A=s.create(''),B=s.create('