From e214fec9b9b91d98852e9385b9e5027e6155c118 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 18 Apr 2016 14:07:24 +0000
Subject: [PATCH] SSDM-3512 : Splitting configuration file
SVN: 36201
---
.../1/as/webapps/eln-lims/html/config.js | 8 ++++
.../1/as/webapps/eln-lims/html/index.html | 38 ++++++-------------
2 files changed, 19 insertions(+), 27 deletions(-)
create mode 100644 openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/config.js
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/config.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/config.js
new file mode 100644
index 00000000000..91694f2200b
--- /dev/null
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/config.js
@@ -0,0 +1,8 @@
+//<PROFILE_PLACEHOLDER>
+var profile = new StandardProfile();
+//</PROFILE_PLACEHOLDER>
+
+//
+// Global variables
+//
+var mainController = new MainController(profile);
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
index 078966269be..a3d4cebe1bd 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
@@ -208,38 +208,22 @@
<script type="text/javascript" src="./js/views/ExperimentTable/ExperimentTableModel.js"></script>
<script type="text/javascript" src="./js/views/ExperimentTable/ExperimentTableView.js"></script>
+ <script type="text/javascript" src="./config.js"></script>
<script type="text/javascript">
- //
- // Configurations Available (Available under the js/config folder)
- // Use StandardProfile as a standard default for new installations.
- // Use ExampleProfile as a start point to develop new profiles.
- //
-
- //<PROFILE_PLACEHOLDER>
- var profile = new StandardProfile();
- //</PROFILE_PLACEHOLDER>
-
- //
- // Global variables
- //
- var mainController = new MainController(profile);
-
- //
- // Global links handler - This function avoid normal link behaviour for javascript enabled links that will use ajax calls for left clicks, allowing to open them on a new tab with right click.
- //
- $(document).click(function(e) {
- var elementClasses = $(e.target).attr('class');
- var isLeftClick = e.which === 1;
- if(isLeftClick && elementClasses && elementClasses.indexOf("browser-compatible-javascript-link") !== -1) {
- e.preventDefault();
- e.stopPropagation();
- }
- });
-
//
// Application Startup
//
$(document).ready(function() {
+ // Global links handler - This function avoid normal link behaviour for javascript enabled links that will use ajax calls for left clicks, allowing to open them on a new tab with right click.
+ $(document).click(function(e) {
+ var elementClasses = $(e.target).attr('class');
+ var isLeftClick = e.which === 1;
+ if(isLeftClick && elementClasses && elementClasses.indexOf("browser-compatible-javascript-link") !== -1) {
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ });
+
$(document).ajaxError(function( event, jqxhr, settings, thrownError ) {
try {
Util.showError("AJAX Error status: " + jqxhr.status + " - Status text: " + jqxhr.statusText + " - Calling: " + settings.url + " - With Data: " + settings.data);
--
GitLab