From c3aa1a47edd7251b75ce7584fbcb2522b4e6ee50 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 18 Apr 2016 13:32:35 +0000
Subject: [PATCH] SSDM-3524 : Jquery set to non conflict mode and stop using
the $ in v3
SVN: 36195
---
.../cisd/openbis/public/resources/api/v3/openbis.js | 11 ++++++-----
.../cisd/openbis/public/resources/api/v3/util/Json.js | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
index 8634b119831..79a8bd893d0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js
@@ -1,5 +1,6 @@
-define([ 'jquery', 'util/Json' ], function($, stjsUtil) {
-
+define([ 'jquery', 'util/Json' ], function(jquery, stjsUtil) {
+ jquery.noConflict();
+
var __private = function() {
this.ajaxRequest = function(settings) {
@@ -37,7 +38,7 @@ define([ 'jquery', 'util/Json' ], function($, stjsUtil) {
var originalError = settings.error || function() {
};
- var dfd = $.Deferred();
+ var dfd = jquery.Deferred();
function success(response) {
if (response.error) {
thisPrivate.log("Request failed - data: " + JSON.stringify(settings.data) + ", error: " + JSON.stringify(response.error));
@@ -61,14 +62,14 @@ define([ 'jquery', 'util/Json' ], function($, stjsUtil) {
dfd.reject(error);
}
- $.ajax(settings).done(success).fail(error);
+ jquery.ajax(settings).done(success).fail(error);
return dfd.promise();
};
this.loginCommon = function(user, isAnonymousUser, response) {
var thisPrivate = this;
- var dfd = $.Deferred();
+ var dfd = jquery.Deferred();
response.done(function(sessionToken) {
if (sessionToken && (isAnonymousUser || sessionToken.indexOf(user) > -1)) {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
index 82b676a177b..1d1c13b719a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
@@ -1,12 +1,12 @@
/**
* Library
*/
-define([ "underscore" ], function(_) {
+define([ 'jquery', 'underscore' ], function(jquery, _) {
var Json = function() {
}
Json.prototype.fromJson = function(jsonType, jsonObject) {
- var dfd = $.Deferred();
+ var dfd = jquery.Deferred();
var types = {}
collectTypes(jsonObject, types);
--
GitLab