diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js index b6510bc4f4d5e3eef4dc76fa62dc1c0aba3a4103..8160e2af1cee0df7128d04f7642f8da1f1bb0f5c 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js @@ -122,20 +122,12 @@ var Util = new function() { } this.showSuccess = function(withHTML, andCallback, forceAutoHide) { - var isiPad = navigator.userAgent.match(/iPad/i) != null; - if(!isiPad && !forceAutoHide) { - withHTML = withHTML + "<br>" + "<a class='btn btn-default'>OK</a>"; - } - if(!forceAutoHide) { - forceAutoHide = false; - } - this.blockUINoMessage(); var localReference = this; jSuccess( withHTML, { - autoHide : isiPad || forceAutoHide, - clickOverlay : false, + autoHide : true, + clickOverlay : true, MinWidth : 250, TimeShown : 2000, ShowTimeEffect : 200, diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js index 5c082ebc1a922596a33af7d4bb2a8778a7513837..1ef31d6465d65b976979156f7018de0513dae029 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js @@ -159,9 +159,9 @@ function DataSetFormController(mainController, mode, sample, dataSet) { if(_this._dataSetFormModel.mode === FormMode.CREATE) { - Util.showSuccess("DataSet Created.", callbackOk, true); + Util.showSuccess("DataSet Created.", callbackOk); } else if(_this._dataSetFormModel.mode === FormMode.EDIT) { - Util.showSuccess("DataSet Updated.", callbackOk, true); + Util.showSuccess("DataSet Updated.", callbackOk); } } else { //This should never happen diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js index af5eee1e42acfad014a888db4475751dc0b24fcf..dca6c45015d44670a1c012d437fabb5e131744a8 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js @@ -121,7 +121,7 @@ function ExperimentFormController(mainController, mode, experiment) { Util.unblockUI(); } - Util.showSuccess(experimentTypeDisplayName + " " + message, callbackOk, true); + Util.showSuccess(experimentTypeDisplayName + " " + message, callbackOk); } else { //This should never happen Util.showError("Unknown Error.", function() {Util.unblockUI();}); } diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js index f473175e53b3fe75b0ee608c25b4528532bfa548..fb4b4d68f8ff3d0ca15fadeeed0e461654e2dbe3 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js @@ -93,7 +93,7 @@ function ProjectFormController(mainController, mode, project) { Util.unblockUI(); } - Util.showSuccess(message, callbackOk, true); + Util.showSuccess(message, callbackOk); } else { //This should never happen Util.showError("Unknown Error.", function() {Util.unblockUI();}); } diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js index f07b0e5ed60336a400fa1566ff9455a6c895b1ec..5d86934a2584189d99acd01431d8e15a1f861ce2 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js @@ -371,14 +371,9 @@ function SampleFormController(mainController, mode, sample) { } }); } - -// TO-DO: The Sample is not necessarily searchable after creation since the index runs asynchronously -// localReference.serverFacade.searchWithType(localReference.sampleTypeCode, $("#sampleCode")[0].value, function(data) { -// mainController.changeView('showViewSamplePageFromPermId',data[0].permId); -// }); } - Util.showSuccess(sampleTypeDisplayName + " " + message, callbackOk, true); + Util.showSuccess(sampleTypeDisplayName + " " + message, callbackOk); _this._sampleFormModel.isFormDirty = false; } else { //This should never happen Util.showError("Unknown Error.", function() {Util.unblockUI();});