SP-557 / BIS-151 : openbis.js - replace /resources/js/* with...

SP-557 / BIS-151 : openbis.js - replace /resources/js/* with resources/js-new/* and make sure the webapps still work - examples fix

SVN: 28667

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>

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>

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>

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) {

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>