From 7c3aed07224434fe96fbe879fa6a55a7faf1c2ef Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Thu, 21 Mar 2013 14:51:56 +0000
Subject: [PATCH] SP-557 / BIS-151 : openbis.js - replace /resources/js/* with
resources/js-new/* and make sure the webapps still work - examples fix
SVN: 28667
---
.../crud-demo/1/as/webapps/crud-demo/html/index.html | 2 +-
.../service-demo/1/as/webapps/aggregation/html/index.html | 2 +-
.../service-demo/1/as/webapps/ingestion/html/index.html | 2 +-
.../cisd/openbis/public/resources/js/openbis-login.js | 8 +++++---
.../javascript/simpleapp/openbis-simple-app.html | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/openbis/resource/examples/crud-demo/1/as/webapps/crud-demo/html/index.html b/openbis/resource/examples/crud-demo/1/as/webapps/crud-demo/html/index.html
index b8458ba9983..3033a4b0378 100644
--- a/openbis/resource/examples/crud-demo/1/as/webapps/crud-demo/html/index.html
+++ b/openbis/resource/examples/crud-demo/1/as/webapps/crud-demo/html/index.html
@@ -19,7 +19,7 @@
<script>
$(document).ready(function() {
- configureLoginPage(openbisServer, enterApp);
+ new openbisLoginPage(openbisServer, enterApp).configure();
});
</script>
diff --git a/openbis/resource/examples/service-demo/1/as/webapps/aggregation/html/index.html b/openbis/resource/examples/service-demo/1/as/webapps/aggregation/html/index.html
index 9cd55737284..c3246590234 100644
--- a/openbis/resource/examples/service-demo/1/as/webapps/aggregation/html/index.html
+++ b/openbis/resource/examples/service-demo/1/as/webapps/aggregation/html/index.html
@@ -19,7 +19,7 @@
<script>
$(document).ready(function() {
- configureLoginPage(openbisServer, enterApp);
+ new openbisLoginPage(openbisServer, enterApp).configure();
});
</script>
diff --git a/openbis/resource/examples/service-demo/1/as/webapps/ingestion/html/index.html b/openbis/resource/examples/service-demo/1/as/webapps/ingestion/html/index.html
index 9cd55737284..c3246590234 100644
--- a/openbis/resource/examples/service-demo/1/as/webapps/ingestion/html/index.html
+++ b/openbis/resource/examples/service-demo/1/as/webapps/ingestion/html/index.html
@@ -19,7 +19,7 @@
<script>
$(document).ready(function() {
- configureLoginPage(openbisServer, enterApp);
+ new openbisLoginPage(openbisServer, enterApp).configure();
});
</script>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis-login.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis-login.js
index 939cfc84b3d..7d1ece5965c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis-login.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis-login.js
@@ -40,6 +40,8 @@ function openbisLoginPage(openbis, onLogin)
}
openbisLoginPage.prototype.configure = function(){
+ var loginPage = this;
+
$('#main').hide();
var username = $("#username").value;
@@ -50,7 +52,7 @@ openbisLoginPage.prototype.configure = function(){
}
$('#logout-button').click(function() {
- openbis.logout(function(data) {
+ loginPage.openbis.logout(function(data) {
$("#login-form-div").show();
$("#main").hide();
$("#username").focus();
@@ -58,10 +60,10 @@ openbisLoginPage.prototype.configure = function(){
});
$('#login-form').submit(function() {
- openbis.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { onLogin(data) })
+ loginPage.openbis.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { loginPage.onLogin(data) })
});
- openbis.ifRestoredSessionActive(function(data) { onLogin(data) });
+ loginPage.openbis.ifRestoredSessionActive(function(data) { loginPage.onLogin(data) });
// Make the ENTER key the default button
$("login-form input").keypress(function (e) {
diff --git a/openbis/sourceTest/javascript/simpleapp/openbis-simple-app.html b/openbis/sourceTest/javascript/simpleapp/openbis-simple-app.html
index 8621fe0dd3f..4d2ef44a50b 100644
--- a/openbis/sourceTest/javascript/simpleapp/openbis-simple-app.html
+++ b/openbis/sourceTest/javascript/simpleapp/openbis-simple-app.html
@@ -154,7 +154,7 @@ function enterApp(data)
$(document).ready(function() {
- configureLoginPage(openbisServer, enterApp);
+ new openbisLoginPage(openbisServer, enterApp).configure();
});
</script>
--
GitLab