diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js index 83922b9f487db531ea9a8cbad319af7345b2a674..808df5c63bc5b5c0fe73ffde4e5bf5e1466d32df 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js @@ -438,12 +438,13 @@ var LayoutManager = { }, resize : function(view, forceFirstTime) { if(this.canReload()) { - console.log("reloadView"); this.reloadView(view, forceFirstTime); } } } $(window).resize(function() { - LayoutManager.resize(mainController.views, true); + if(mainController && mainController.views) { + LayoutManager.resize(mainController.views, true); + } }); \ No newline at end of file diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js index b590ee518e7068dccd960a1ad80205e37241b391..2f3f0ff1bc92be2232794c5f2f1fb6e16dc7c1a5 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js @@ -1149,7 +1149,7 @@ var FormUtil = new function() { Â Â Â Â // this.showDiskSpaceDialog = function() { - let _this = this; + var _this = this; Util.blockUI(null, null, true); @@ -1161,26 +1161,26 @@ var FormUtil = new function() { Util.showError("Could not get disk space information."); } else { - let $dialog = $("<div>"); + var $dialog = $("<div>"); $dialog .append($("<div>") .append($("<legend>").text("Available storage space:"))); - let $formFieldContainer = $("<div>"); + var $formFieldContainer = $("<div>"); $dialog.append($formFieldContainer); // close button - let $closeButton = $("<a>", { + var $closeButton = $("<a>", { class : "btn btn-default", id : "dropboxFolderNameClose" }).text("Close").css("margin-top", "15px"); $dialog.append($closeButton); // add disk space - let rowHeight = "50px"; - let barHeight = "30px"; + var rowHeight = "50px"; + var barHeight = "30px"; - let $table = $("<table>"); + var $table = $("<table>"); $table .append($("<thead>") .append($("<tr>").css("height", rowHeight) @@ -1201,16 +1201,16 @@ var FormUtil = new function() { $table.append($tbody); $formFieldContainer.append($table); - let diskSpaceValues = result.data; - for (let i=0; i<diskSpaceValues.length; i++) { - let filesystem = diskSpaceValues[i]["Mounted_on"] - let size = diskSpaceValues[i]["Size"] - let used = diskSpaceValues[i]["Used"] - let avail = diskSpaceValues[i]["Avail"] - let usedPercentage = diskSpaceValues[i]["UsedPercentage"] + var diskSpaceValues = result.data; + for (var i=0; i<diskSpaceValues.length; i++) { + var filesystem = diskSpaceValues[i]["Mounted_on"] + var size = diskSpaceValues[i]["Size"] + var used = diskSpaceValues[i]["Used"] + var avail = diskSpaceValues[i]["Avail"] + var usedPercentage = diskSpaceValues[i]["UsedPercentage"] - let $diskSpaceSection = $("<div>"); - let $total = $("<div>").css({ + var $diskSpaceSection = $("<div>"); + var $total = $("<div>").css({ height : barHeight, width : "100%", "background-color" : "lightgray", @@ -1220,7 +1220,7 @@ var FormUtil = new function() { "line-height" : barHeight, }); $total.text(usedPercentage); - let $used = $("<div>").css({ + var $used = $("<div>").css({ height: barHeight, width : usedPercentage, "background-color" : "lightblue", diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js index dc34da9e5bef87ddcc20df9e47d3e255c2a58626..f63c725e0912feb27bb7de50ef72ea1da0c4f81d 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/StorageListView.js @@ -144,12 +144,12 @@ function StorageListView(storageListController, storageListModel) { } // multi-select delete option - let isMultiselectable = false; + var isMultiselectable = false; var extraOptions = []; if(!this._storageListModel.isDisabled) { isMultiselectable = true; extraOptions.push({ name : "Delete selected", action : function(selected) { - for (let i=0; i<selected.length; i++) { + for (var i=0; i<selected.length; i++) { _this.removeChildFromSampleOrMarkToDelete(selected[i]); } _this._dataGrid.refresh();