diff --git a/openam-external-libs/pom.xml b/openam-external-libs/pom.xml
index 5820aecad7..60992fcb1b 100644
--- a/openam-external-libs/pom.xml
+++ b/openam-external-libs/pom.xml
@@ -525,12 +525,13 @@
install-file
- ${basedir}/src/main/resources/bootstrap-tabdrop-1.0.js
+ ${basedir}/src/main/resources/bootstrap-tabdrop-1.0-openam-jp.js
jp.openam.commons.ui.libs
bootstrap-tabdrop
1.0
js
true
+ openam-jp
diff --git a/openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0.js b/openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0-openam-jp.js
similarity index 94%
rename from openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0.js
rename to openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0-openam-jp.js
index e1de4fd984..79eeffb5a4 100644
--- a/openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0.js
+++ b/openam-external-libs/src/main/resources/bootstrap-tabdrop-1.0-openam-jp.js
@@ -36,7 +36,7 @@
register: function(fn) {
registered.push(fn);
if (inited === false) {
- $(window).bind('resize', resize);
+ $(window).on('resize', resize);
inited = true;
}
},
@@ -114,4 +114,4 @@
$.fn.tabdrop.Constructor = TabDrop;
-}( window.jQuery );
\ No newline at end of file
+}( window.jQuery );
diff --git a/openam-oauth2/src/main/resources/templates/CodeThanks.ftl b/openam-oauth2/src/main/resources/templates/CodeThanks.ftl
index 4c58f154cd..6c44f7a765 100644
--- a/openam-oauth2/src/main/resources/templates/CodeThanks.ftl
+++ b/openam-oauth2/src/main/resources/templates/CodeThanks.ftl
@@ -13,6 +13,7 @@
~ information: "Portions copyright [year] [name of copyright owner]".
~
~ Copyright 2015 ForgeRock AS.
+~ Portions copyright 2020 Open Source Solution Technology Corporation
-->
@@ -34,6 +35,6 @@
done: true
};
-
+
diff --git a/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl b/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl
index 16b2d7cee9..d3340453a4 100644
--- a/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl
+++ b/openam-oauth2/src/main/resources/templates/CodeVerificationForm.ftl
@@ -13,6 +13,7 @@
~ information: "Portions copyright [year] [name of copyright owner]".
~
~ Copyright 2015 ForgeRock AS.
+~ Portions copyright 2020 Open Source Solution Technology Corporation
-->
@@ -34,6 +35,6 @@
baseUrl : "${baseUrl?js_string}/XUI"
};
-
+
diff --git a/openam-oauth2/src/main/resources/templates/page/authorize.ftl b/openam-oauth2/src/main/resources/templates/page/authorize.ftl
index 0b1c35105a..ef73098546 100644
--- a/openam-oauth2/src/main/resources/templates/page/authorize.ftl
+++ b/openam-oauth2/src/main/resources/templates/page/authorize.ftl
@@ -23,7 +23,7 @@
~ "Portions Copyrighted [year] [name of copyright owner]"
~
~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
- ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+ ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
-->
@@ -61,6 +61,6 @@
}
};
-
+
diff --git a/openam-oauth2/src/main/resources/templates/page/error.ftl b/openam-oauth2/src/main/resources/templates/page/error.ftl
index c54b7eabf0..54ad4bdc71 100644
--- a/openam-oauth2/src/main/resources/templates/page/error.ftl
+++ b/openam-oauth2/src/main/resources/templates/page/error.ftl
@@ -23,6 +23,7 @@
~ "Portions Copyrighted [year] [name of copyright owner]"
~
~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
+ ~ Portions Copyrighted 2020 Open Source Solution Technology Corporation
-->
@@ -53,6 +54,6 @@
}
-
+
diff --git a/openam-oauth2/src/main/resources/templates/popup/authorize.ftl b/openam-oauth2/src/main/resources/templates/popup/authorize.ftl
index f3ef91daea..493793b1ed 100644
--- a/openam-oauth2/src/main/resources/templates/popup/authorize.ftl
+++ b/openam-oauth2/src/main/resources/templates/popup/authorize.ftl
@@ -23,7 +23,7 @@
~ "Portions Copyrighted [year] [name of copyright owner]"
~
~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
- ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+ ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
-->
@@ -60,6 +60,6 @@
}
};
-
+
diff --git a/openam-oauth2/src/main/resources/templates/touch/authorize.ftl b/openam-oauth2/src/main/resources/templates/touch/authorize.ftl
index 07ea32ad47..2188d9d84d 100644
--- a/openam-oauth2/src/main/resources/templates/touch/authorize.ftl
+++ b/openam-oauth2/src/main/resources/templates/touch/authorize.ftl
@@ -23,7 +23,7 @@
~ "Portions Copyrighted [year] [name of copyright owner]"
~
~ Portions Copyrighted 2014 Nomura Research Institute, Ltd
- ~ Portions Copyrighted 2019 Open Source Solution Technology Corp.
+ ~ Portions Copyrighted 2019-2020 Open Source Solution Technology Corp.
-->
@@ -60,6 +60,6 @@
}
};
-
+
diff --git a/openam-ui/openam-ui-ria/npm-shrinkwrap.json b/openam-ui/openam-ui-ria/npm-shrinkwrap.json
index 90921cbaef..51ffb0751f 100644
--- a/openam-ui/openam-ui-ria/npm-shrinkwrap.json
+++ b/openam-ui/openam-ui-ria/npm-shrinkwrap.json
@@ -3309,9 +3309,9 @@
"resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz"
},
"requirejs": {
- "version": "2.2.0",
- "from": "requirejs@2.2.0",
- "resolved": "http://maven.forgerock.org/repo/api/npm/npm-virtual/requirejs/-/requirejs-2.2.0.tgz"
+ "version": "2.3.6",
+ "from": "requirejs@2.3.6",
+ "resolved": "http://maven.forgerock.org/repo/api/npm/npm-virtual/requirejs/-/requirejs-2.3.6.tgz"
},
"requires-port": {
"version": "1.0.0",
diff --git a/openam-ui/openam-ui-ria/package.json b/openam-ui/openam-ui-ria/package.json
index 5420456ad9..bd7b891a42 100644
--- a/openam-ui/openam-ui-ria/package.json
+++ b/openam-ui/openam-ui-ria/package.json
@@ -48,7 +48,7 @@
"lodash": "3.10.1",
"mocha": "2.5.3",
"phantomjs-prebuilt": "2.1.7",
- "requirejs": "2.2.0",
+ "requirejs": "2.3.6",
"rimraf": "2.5.2",
"sinon": "1.17.4",
"sinon-chai": "2.8.0"
diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml
index 2d56e1e32f..040f6a3372 100644
--- a/openam-ui/openam-ui-ria/pom.xml
+++ b/openam-ui/openam-ui-ria/pom.xml
@@ -100,6 +100,7 @@
jp.openam.commons.ui.libs
bootstrap-tabdrop
1.0
+ openam-jp
js
@@ -150,20 +151,6 @@
js
test
-
- jp.openam.commons.ui.libs
- qunit
- 1.15.0
- js
- test
-
-
- jp.openam.commons.ui.libs
- qunit
- css
- 1.15.0
- test
-
jp.openam.commons.ui.libs
squire
@@ -264,7 +251,7 @@
${project.build.directory}/test-classes/libs
- sinon,qunit,squire
+ sinon,squire
false
false
true
diff --git a/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js b/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js
index c7f55c770b..365d639311 100644
--- a/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js
+++ b/openam-ui/openam-ui-ria/src/main/js/config/process/AMConfig.js
@@ -16,7 +16,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/EventManager",
diff --git a/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js b/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js
index 955973f1e4..8be9d22454 100644
--- a/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js
+++ b/openam-ui/openam-ui-ria/src/main/js/config/validators/AMValidators.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery"
+ "jquery-migrate"
], function ($) {
var obj = {
"validPhoneFormat": {
diff --git a/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js b/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js
index 80e17e4746..456044304a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js
+++ b/openam-ui/openam-ui-ria/src/main/js/jp/co/osstech/openam/server/util/webauthn.js
@@ -11,11 +11,11 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
- * Copyright 2019 Open Source Solution Technology Corporation
+ * Copyright 2019-2020 Open Source Solution Technology Corporation
*/
define("jp/co/osstech/openam/server/util/webauthn", [
- "jquery"
+ "jquery-migrate"
], function ($) {
var obj = {};
@@ -44,11 +44,11 @@ define("jp/co/osstech/openam/server/util/webauthn", [
const jsonbody = JSON.stringify(jdata);
$("#PublicKeyCredential").val(jsonbody);
- $("#idToken3_0").click();
+ $("#idToken3_0").trigger("click");
})
.catch((err) => {
console.log("ERROR", err);
- $("#idToken3_1").click();
+ $("#idToken3_1").trigger("click");
});
};
@@ -73,11 +73,11 @@ define("jp/co/osstech/openam/server/util/webauthn", [
const jsonbody = JSON.stringify(jdata);
$("#PublicKeyCredential").val(jsonbody);
- $("#idToken3_0").click();
+ $("#idToken3_0").trigger("click");
})
.catch((err) => {
console.log("ERROR", err);
- $("#idToken3_1").click();
+ $("#idToken3_1").trigger("click");
});
};
diff --git a/openam-ui/openam-ui-ria/src/main/js/main-authorize.js b/openam-ui/openam-ui-ria/src/main/js/main-authorize.js
index 4d1e5bac35..3977454567 100644
--- a/openam-ui/openam-ui-ria/src/main/js/main-authorize.js
+++ b/openam-ui/openam-ui-ria/src/main/js/main-authorize.js
@@ -20,6 +20,8 @@
* with the fields enclosed by brackets [] replaced by
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
require.config({
@@ -35,10 +37,15 @@ require.config({
"lodash": "libs/lodash-3.10.1-min",
"handlebars": "libs/handlebars-4.0.5",
"i18next": "libs/i18next-1.7.3-min",
- "jquery": "libs/jquery-2.1.1-min",
+ "jquery": "libs/jquery-3.5.1-min",
+ "jquery-migrate": "libs/jquery-migrate-3.3.0",
"text": "libs/text-2.0.15"
},
shim: {
+ "jquery-migrate": {
+ deps: ["jquery"],
+ exports: "jQuery"
+ },
"handlebars": {
exports: "handlebars"
},
@@ -53,7 +60,7 @@ require.config({
});
require([
- "jquery",
+ "jquery-migrate",
"lodash",
"handlebars",
"org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper",
@@ -145,7 +152,7 @@ require([
$("#wrapper").html(baseTemplate(data));
$("#footer").html(footerTemplate(data));
$("#loginBaseLogo").html(loginHeaderTemplate(data));
- $("#content").html(formTemplate(data)).find(".panel-heading").bind("click keyup", function (e) {
+ $("#content").html(formTemplate(data)).find(".panel-heading").on("click keyup", function (e) {
// keyup is required so that the collapsed panel can be opened with the keyboard alone,
// and without relying on a mouse click event.
if (e.type === "keyup" && e.keyCode !== KEY_CODE_ENTER && e.keyCode !== KEY_CODE_SPACE) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/main-device.js b/openam-ui/openam-ui-ria/src/main/js/main-device.js
index eb8d013490..c64b934afe 100644
--- a/openam-ui/openam-ui-ria/src/main/js/main-device.js
+++ b/openam-ui/openam-ui-ria/src/main/js/main-device.js
@@ -12,6 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
require.config({
@@ -27,10 +28,15 @@ require.config({
"lodash": "libs/lodash-3.10.1-min",
"handlebars": "libs/handlebars-4.0.5",
"i18next": "libs/i18next-1.7.3-min",
- "jquery": "libs/jquery-2.1.1-min",
+ "jquery": "libs/jquery-3.5.1-min",
+ "jquery-migrate": "libs/jquery-migrate-3.3.0",
"text": "libs/text-2.0.15"
},
shim: {
+ "jquery-migrate": {
+ deps: ["jquery"],
+ exports: "jQuery"
+ },
"handlebars": {
exports: "handlebars"
},
@@ -45,7 +51,7 @@ require.config({
});
require([
- "jquery",
+ "jquery-migrate",
"handlebars",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/openam/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/main.js b/openam-ui/openam-ui-ria/src/main/js/main.js
index 08c3bfeaac..18ed6eeaa9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/main.js
+++ b/openam-ui/openam-ui-ria/src/main/js/main.js
@@ -12,7 +12,7 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2019 Open Source Solution Technology Corporation
+ * Portions copyright 2019-2020 Open Source Solution Technology Corporation
*/
require.config({
@@ -47,14 +47,15 @@ require.config({
"bootstrap" : "libs/bootstrap-3.4.1-openam-jp",
"bootstrap-datetimepicker": "libs/bootstrap-datetimepicker-4.14.30-min",
"bootstrap-dialog" : "libs/bootstrap-dialog-1.34.4-min",
- "bootstrap-tabdrop" : "libs/bootstrap-tabdrop-1.0",
+ "bootstrap-tabdrop" : "libs/bootstrap-tabdrop-1.0-openam-jp",
"clockPicker" : "libs/bootstrap-clockpicker-0.0.7-0915edd-min",
"doTimeout" : "libs/jquery.ba-dotimeout-1.0-min",
"form2js" : "libs/form2js-2.0-769718a",
"handlebars" : "libs/handlebars-4.0.5",
"i18next" : "libs/i18next-1.7.3-min",
- "jquery" : "libs/jquery-2.1.1-min",
+ "jquery" : "libs/jquery-3.5.1-min",
+ "jquery-migrate": "libs/jquery-migrate-3.3.0",
"js2form" : "libs/js2form-2.0-769718a",
"jsonEditor" : "libs/jsoneditor-0.7.23-custom",
"lodash" : "libs/lodash-3.10.1-min",
@@ -70,6 +71,10 @@ require.config({
"text": "libs/text-2.0.15"
},
shim: {
+ "jquery-migrate": {
+ deps: ["jquery"],
+ exports: "jQuery"
+ },
"autosizeInput": {
deps: ["jquery"],
exports: "autosizeInput"
@@ -163,7 +168,7 @@ require([
"org/forgerock/commons/ui/common/main/EventManager",
// other modules that are necessary to include to startup the app
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"handlebars",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js
index f46d3e3f21..33fc087ace 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/server/util/QRCodeReader.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"qrcode"
], function ($, QRCodeReader) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/models/Form.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/models/Form.js
index ecf55e4256..3c52e9fd50 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/models/Form.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/models/Form.js
@@ -12,13 +12,14 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
/**
* @deprecated
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"jsonEditor",
"org/forgerock/openam/ui/admin/utils/JSONEditorTheme",
@@ -53,7 +54,7 @@ define([
*/
$(element).find("input:password").attr("placeholder", $.t("common.form.passwordPlaceholder"));
- $(element).find(".help-block").addClass("hidden-lg hidden-md hidden-sm").each(function () {
+ $(element).find(".help-block").each(function () {
var group = $(this).parent(),
element = $(' {
@@ -157,7 +158,8 @@ define([
var el = document.createElement("div"),
parseHtml = document.implementation.createHTMLDocument("");
- el.className = `col-sm-offset-${gridColWidth2} col-sm-${gridColWidth3} help-block`;
+ el.className = `col-sm-offset-${gridColWidth2} col-sm-${gridColWidth3}` +
+ " help-block hidden-lg hidden-md hidden-sm";
parseHtml.body.innerHTML = `${text}
`;
el.appendChild(parseHtml.body.getElementsByTagName("div")[0]);
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/RedirectToLegacyConsole.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/RedirectToLegacyConsole.js
index df7f62203f..1cd8a7bb97 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/RedirectToLegacyConsole.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/RedirectToLegacyConsole.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/commons/ui/common/util/Constants"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/bindSavePromiseToElement.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/bindSavePromiseToElement.js
index 70736c0301..fe333e0097 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/bindSavePromiseToElement.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/bindSavePromiseToElement.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/admin/utils/form/bindSavePromiseToElement
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages"
], ($, _, Messages) =>
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting.js
index 3fdbe38712..16d0e3983c 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/components/BootstrapDialog"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/Backlink.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/Backlink.js
index 6df2b256d2..c781b4ae47 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/Backlink.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/Backlink.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/admin/views/common/Backlink
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/util/URIUtils",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/TabSearch.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/TabSearch.js
index 3bee2968b2..45d728c7e9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/TabSearch.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/TabSearch.js
@@ -19,7 +19,7 @@
*/
define([
"lodash",
- "jquery",
+ "jquery-migrate",
"backbone",
"handlebars",
"selectize"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/ToggleCardListView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/ToggleCardListView.js
index df592bd130..d595d85a8a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/ToggleCardListView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/ToggleCardListView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"backbone",
"org/forgerock/commons/ui/common/util/UIUtils"
], ($, Backbone, UIUtils) =>
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/navigation/createBreadcrumbs.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/navigation/createBreadcrumbs.js
index 454c3e3848..01854a38ee 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/navigation/createBreadcrumbs.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/navigation/createBreadcrumbs.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/util/URIUtils"
], ($, _, URIUtils) => {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/EditSchemaComponent.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/EditSchemaComponent.js
index 6f96574a5f..44c7508573 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/EditSchemaComponent.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/EditSchemaComponent.js
@@ -12,13 +12,14 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
/**
* @module org/forgerock/openam/ui/admin/views/common/schema/EditSchemaComponent
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/components/Messages",
@@ -168,7 +169,7 @@ define([
properties: this.data.schema.raw.properties,
onChange: (tabId, value) => {
this.subview.setTabId(tabId);
- this.$el.find(`[data-schemapath="root.${value}"]`).find("input").focus();
+ this.$el.find(`[data-schemapath="root.${value}"]`).find("input").trigger("focus");
}
};
this.$el.find("[data-tab-search]").append(new TabSearch(options).render().$el);
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent.js
index 09d8c8f5ff..a967f56ed9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent
*/
define("org/forgerock/openam/ui/admin/views/common/schema/SubSchemaListComponent", [
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/server/EditServerView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/server/EditServerView.js
index 051ef1eb5b..9aa9626eb3 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/server/EditServerView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/common/server/EditServerView.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
@@ -96,9 +97,9 @@ define([
// The input is disabled because the value is being inherited. However we are
// still able to scroll to the correct row by focusing on the inherit button
// first.
- input.closest(".form-group").find("button").focus().blur();
+ input.closest(".form-group").find("button").trigger("focus").trigger("blur");
} else {
- input.focus();
+ input.trigger("focus");
}
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/authentication/ListAuthenticationView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/authentication/ListAuthenticationView.js
index ac43c49c35..1f6be06b65 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/authentication/ListAuthenticationView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/authentication/ListAuthenticationView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/openam/ui/admin/views/configuration/createConfigurationListView",
"org/forgerock/openam/ui/admin/services/global/AuthenticationService"
], ($, createConfigurationListView, AuthenticationService) => {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/global/ListGlobalServicesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/global/ListGlobalServicesView.js
index 97808868fd..b432069047 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/global/ListGlobalServicesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/global/ListGlobalServicesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/openam/ui/admin/views/configuration/createConfigurationListView",
"org/forgerock/openam/ui/admin/services/global/ServicesService"
], ($, createConfigurationListView, ServicesService) => {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/server/EditServerDefaultsTreeNavigationView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/server/EditServerDefaultsTreeNavigationView.js
index 36b8dd2d87..2323fe0130 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/server/EditServerDefaultsTreeNavigationView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/configuration/server/EditServerDefaultsTreeNavigationView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/openam/ui/common/components/TreeNavigation",
"org/forgerock/openam/ui/admin/views/common/navigation/createTreeNavigation",
"org/forgerock/commons/ui/common/main/Router"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/ListServersView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/ListServersView.js
index 4568c89fee..3939742e47 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/ListServersView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/ListServersView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/NewServerView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/NewServerView.js
index 480c627140..cc11fe9370 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/NewServerView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/servers/NewServerView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/EditSiteView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/EditSiteView.js
index c0813f9cbd..badb9a1967 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/EditSiteView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/EditSiteView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/ListSitesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/ListSitesView.js
index 1d808e3d79..ac2bf94f96 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/ListSitesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/ListSitesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/admin/utils/form/showConfirmationBeforeDeleting",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/NewSiteView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/NewSiteView.js
index 4d60536e35..3e7aa18dfd 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/NewSiteView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/deployment/sites/NewSiteView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/EditRealmView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/EditRealmView.js
index 4b14bfbdc2..2e13327dc4 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/EditRealmView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/EditRealmView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"handlebars",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/ListRealmsView.jsm b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/ListRealmsView.jsm
index 79a26a5765..619030a9a2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/ListRealmsView.jsm
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/ListRealmsView.jsm
@@ -14,7 +14,7 @@
* Copyright 2015-2016 ForgeRock AS.
*/
-import $ from "jquery";
+import $ from "jquery-migrate";
import AbstractView from "org/forgerock/commons/ui/common/main/AbstractView";
import BootstrapDialog from "org/forgerock/commons/ui/common/components/BootstrapDialog";
import Messages from "org/forgerock/commons/ui/common/components/Messages";
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/RealmTreeNavigationView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/RealmTreeNavigationView.js
index 5b0f2bd856..6669a16dbb 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/RealmTreeNavigationView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/RealmTreeNavigationView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/EventManager",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ChainsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ChainsView.js
index 993f1c94c3..d31e5aef5b 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ChainsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ChainsView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/EditModuleDialog.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/EditModuleDialog.js
index b756f6bbd6..737fdcc230 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/EditModuleDialog.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/EditModuleDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/commons/ui/common/main/Router"
], function ($, BootstrapDialog, Router) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ModulesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ModulesView.js
index 3463f1f302..eadf67a771 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ModulesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/ModulesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/common/util/array/arrayify",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/SettingsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/SettingsView.js
index 1d95a872d0..ee72fa7b4e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/SettingsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/SettingsView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/AddChainView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/AddChainView.js
index 1e66901550..ac5ec6b589 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/AddChainView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/AddChainView.js
@@ -14,7 +14,7 @@
* Copyright 2016 ForgeRock AS.
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/Router",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js
index 7d7ab780f2..a1ef00ef67 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js
@@ -16,7 +16,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditLinkView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditLinkView.js
index 1033eccdc8..b8ca4cbdbe 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditLinkView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditLinkView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/LinkView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/LinkView.js
index 6007130ca7..4cba111d79 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/LinkView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/LinkView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/PostProcessView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/PostProcessView.js
index f091994e6e..8bc37b76ab 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/PostProcessView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/PostProcessView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/AddModuleView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/AddModuleView.js
index 8009c8aa32..d60fb93fe2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/AddModuleView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/AddModuleView.js
@@ -12,9 +12,10 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/Router",
@@ -67,7 +68,7 @@ define([
placeholderText: $.t("console.authentication.modules.selectModuleType")
});
self.$el.find("[data-module-type]").append(selectComponent.render().el);
- self.$el.find("[autofocus]").focus();
+ self.$el.find("[autofocus]").trigger("focus");
if (callback) {
callback();
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/EditModuleView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/EditModuleView.js
index 17e3d4ec2f..62659132c2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/EditModuleView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authentication/modules/EditModuleView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/EventManager",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/AbstractListView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/AbstractListView.js
index 3009d0e7fd..eb45da24d2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/AbstractListView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/AbstractListView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListEditingView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListEditingView.js
index 8b02e25c3c..5f54cc52f3 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListEditingView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListEditingView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -29,8 +30,8 @@ define([
"click [data-add-item]": "addItem",
"keyup [data-add-item]": "addItem",
"keyup [data-editing-input]": "addItem",
- "click span[data-delete]": "deleteItem",
- "keyup span[data-delete]": "deleteItem"
+ "click span[data-delete-item]": "deleteItem",
+ "keyup span[data-delete-item]": "deleteItem"
},
baseRender (data, tpl, el, callback) {
@@ -90,7 +91,7 @@ define([
this.updateEntity();
}
this.renderParent(() => {
- this.$el.find(".editing input[type=text]").focus();
+ this.$el.find(".editing input[type=text]").trigger("focus");
});
}
},
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListView.js
index ff7ebb0886..1e2fc5d8be 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils"
@@ -65,10 +66,10 @@ define([
if (e.type === "keyup") {
switch (e.keyCode) {
case 38: // arrow down
- $(e.target).prev("li").focus();
+ $(e.target).prev("li").trigger("focus");
return;
case 40: // arrow up
- $(e.target).next("li").focus();
+ $(e.target).next("li").trigger("focus");
return;
case 13:
break;
@@ -98,7 +99,7 @@ define([
filterItems (e) {
if (e.type === "keyup" && e.keyCode === 40) {
- $(e.target).parent().next().find("li:first-child").focus();
+ $(e.target).parent().next().find("li:first-child").trigger("focus");
return;
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/CreatedResourcesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/CreatedResourcesView.js
index 38e162ac5e..0d7499ce78 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/CreatedResourcesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/CreatedResourcesView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -33,8 +34,8 @@ define([
"click [data-add-resource]": "addResource",
"keyup [data-add-resource]": "addResource",
"keyup #resourceBuilder input": "addResource",
- "click span[data-delete]": "deleteResource",
- "keyup span[data-delete]": "deleteResource",
+ "click span[data-delete-item]": "deleteResource",
+ "keyup span[data-delete-item]": "deleteResource",
"click [data-remove-pending]": "removePendingResource",
"click [data-show-editing]" : "showEditingResources"
},
@@ -67,7 +68,7 @@ define([
resources.html(content);
resources.find("input").autosizeInput({ space: 19 });
- resources.find("input:eq(0)").focus().select();
+ resources.find("input:eq(0)").trigger("focus").trigger("select");
});
}
});
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/EditPolicyView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/EditPolicyView.js
index 43b6aa1a5c..7988a7b6c9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/EditPolicyView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/EditPolicyView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PoliciesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PoliciesView.js
index eba5f54f23..0b00d63eb7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PoliciesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PoliciesView.js
@@ -17,7 +17,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PolicyActionsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PolicyActionsView.js
index 02073934af..249e453018 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PolicyActionsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/PolicyActionsView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils"
@@ -28,8 +29,8 @@ define([
events: {
"click [data-toggle-item]": "changePermission",
"click [data-action-name]": "selectAction",
- "click button[data-delete]": "deleteItem",
- "keyup button[data-delete]": "deleteItem"
+ "click button[data-delete-item]": "deleteItem",
+ "keyup button[data-delete-item]": "deleteItem"
},
render (data, callback) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/attributes/SubjectResponseAttributesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/attributes/SubjectResponseAttributesView.js
index d147815ed8..1dace888f7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/attributes/SubjectResponseAttributesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/attributes/SubjectResponseAttributesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrArrayView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrArrayView.js
index 816bca9e0c..0d4d0ca3cd 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrArrayView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrArrayView.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView",
"org/forgerock/openam/ui/admin/services/realm/PoliciesService",
@@ -165,9 +166,6 @@ define([
selectize.addOption({ value, text: value });
});
callback(data.result);
- }).error(function (e) {
- console.error("error", e);
- callback();
});
},
@@ -187,9 +185,6 @@ define([
selectize.addOption({ value: value._id, text: value.name });
});
callback(data.result);
- }).error(function (e) {
- console.error("error", e);
- callback();
});
}
});
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView.js
index 03c2475e0f..2d67e8609f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView"
], function ($, _, AbstractView) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBooleanView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBooleanView.js
index 688916375b..3ccb994b9f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBooleanView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBooleanView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView"
], function ($, _, ConditionAttrBaseView) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDateView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDateView.js
index 5b80f317ca..684192426b 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDateView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDateView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView",
"bootstrap-datetimepicker"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDayView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDayView.js
index f6bf602ba2..6f07df7814 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDayView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrDayView.js
@@ -17,7 +17,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView"
], function ($, _, ConditionAttrBaseView) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrEnumView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrEnumView.js
index 33528acacd..5e278419f2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrEnumView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrEnumView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView"
], function ($, _, ConditionAttrBaseView) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrObjectView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrObjectView.js
index a02c6f0e45..2f6cb2aef2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrObjectView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrObjectView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrStringView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrStringView.js
index 0c375ed4d0..30c7514bc0 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrStringView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrStringView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrTimeView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrTimeView.js
index 50ae8191f4..4dd60c5f46 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrTimeView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrTimeView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ConditionAttrBaseView",
"clockPicker"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js
index b66972b26c..64d102004e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditEnvironmentView.js
@@ -12,11 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
- * Portions copyright 2019 Open Source Solution Technology Corporation
+ * Portions copyright 2019-2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils",
@@ -62,7 +62,7 @@ define([
this.data.conditions = _.sortBy(this.data.conditions, "i18nKey");
- UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+ return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
self.$el.append(tpl);
self.setElement(`#environment_${itemID}`);
@@ -81,7 +81,7 @@ define([
self.$el.find("select.type-selection:first").val(itemData.type).trigger("change");
}
- self.$el.find("select.type-selection:first").focus();
+ self.$el.find("select.type-selection:first").trigger("focus");
self.$el.find(".info-button").hide();
@@ -99,7 +99,7 @@ define([
mergedData = _.merge({}, itemData, hiddenData),
type;
- item.focus(); // Required to trigger changeInput.
+ item.trigger("focus"); // Required to trigger changeInput.
this.data.conditions = allEnvironments;
if (mergedData && mergedData.type) {
@@ -223,17 +223,21 @@ define([
schemaProps = schema.config.properties,
i18nKey,
attributesWrapper,
- htmlBuiltPromise = $.Deferred();
+ htmlBuiltPromises = [];
function buildScriptAttr () {
+ var defer = $.Deferred();
+ htmlBuiltPromises.push(defer.promise());
new ArrayAttr().render({
itemData, hiddenData, data: [hiddenData[itemData.type]],
title: "scriptId", dataSource: "scripts", multiple: false,
i18nKey: `${self.i18n.condition.key}${schema.title}${self.i18n.condition.props}scriptId`
- }, itemDataEl, htmlBuiltPromise.resolve);
+ }, itemDataEl, defer.resolve);
}
if (itemData.type === "SimpleTime") {
+ const defer = $.Deferred();
+ htmlBuiltPromises.push(defer.promise());
attributesWrapper = '';
new TimeAttr().render({ itemData }, itemDataEl);
new DayAttr().render({ itemData }, itemDataEl);
@@ -246,11 +250,11 @@ define([
itemData,
data: [itemData.enforcementTimeZone],
title: "enforcementTimeZone",
- i18nKey: `${self.i18n.condition.key}${schema.title}${self.i18n.condition.props}enforcementTimeZone`,
+ i18nKey: `${self.i18n.condition.key}${schema.title}` +
+ `${self.i18n.condition.props}enforcementTimeZone`,
dataSource: "enforcementTimeZone",
multiple: false
- }, itemDataEl);
- htmlBuiltPromise.resolve();
+ }, itemDataEl, defer.resolve);
} else if (schema.title === self.SCRIPT_RESOURCE) {
attributesWrapper = '';
if (itemData && itemData.scriptId) {
@@ -265,6 +269,8 @@ define([
attributesWrapper = '';
_.map(schemaProps, function (value, key) {
+ const defer = $.Deferred();
+ htmlBuiltPromises.push(defer.promise());
i18nKey = self.i18n.condition.key + schema.title + self.i18n.condition.props + key;
switch (value.type) {
@@ -278,7 +284,7 @@ define([
i18nKey,
schema,
value
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
case "boolean":
new BooleanAttr().render({
@@ -287,7 +293,7 @@ define([
title: key,
i18nKey,
selected: itemData[key]
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
case "array":
new ArrayAttr().render({
@@ -295,7 +301,7 @@ define([
data: itemData[key],
title: key,
i18nKey
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
case "object":
new ObjectAttr().render({
@@ -303,20 +309,17 @@ define([
data: itemData[key],
title: key,
i18nKey
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
default:
break;
}
});
- htmlBuiltPromise.resolve();
}
- htmlBuiltPromise.done(function () {
+ return $.when.apply($, htmlBuiltPromises).done(function () {
self.$el.find(".condition-attr").wrapAll(attributesWrapper);
});
-
- return htmlBuiltPromise;
},
setDefaultJsonValues (schema) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js
index a852c5cc83..54d82c7253 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/EditSubjectView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils",
@@ -49,7 +50,7 @@ define([
this.data.subjects = _.sortBy(this.data.subjects, "i18nKey");
- UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+ return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
self.$el.append(tpl);
self.setElement(`#subject_${itemID}`);
@@ -64,7 +65,7 @@ define([
self.$el.find("select.type-selection:first").val(itemData.type).trigger("change");
}
- self.$el.find("select.type-selection:first").focus();
+ self.$el.find("select.type-selection:first").trigger("focus");
if (callback) {
callback();
@@ -83,7 +84,7 @@ define([
mergedData = _.merge({}, itemData, hiddenData);
- item.focus(); // Required to trigger changeInput.
+ item.trigger("focus"); // Required to trigger changeInput.
this.data.subjects = allSubjects;
if (mergedData && mergedData.type) {
@@ -162,10 +163,12 @@ define([
itemDataEl = this.$el.find(".item-data"),
schemaProps = schema.config.properties,
i18nKey,
- htmlBuiltPromise = $.Deferred();
+ htmlBuiltPromises = [];
if (schema.title === self.IDENTITY_RESOURCE) {
_.each(["users", "groups"], function (identityType) {
+ const defer = $.Deferred();
+ htmlBuiltPromises.push(defer.promise());
new ArrayAttr().render({
itemData,
hiddenData,
@@ -173,10 +176,12 @@ define([
title: identityType,
i18nKey: self.subjectI18n.key + schema.title + self.subjectI18n.props + identityType,
dataSource: identityType
- }, itemDataEl, htmlBuiltPromise.resolve);
+ }, itemDataEl, defer.resolve);
});
} else {
_.map(schemaProps, function (value, key) {
+ const defer = $.Deferred();
+ htmlBuiltPromises.push(defer.promise());
i18nKey = self.subjectI18n.key + schema.title + self.subjectI18n.props + key;
switch (value.type) {
@@ -187,7 +192,7 @@ define([
data: itemData[key],
title: key,
i18nKey
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
case "array":
new ArrayAttr().render({
@@ -196,20 +201,17 @@ define([
data: itemData[key],
title: key,
i18nKey
- }, itemDataEl);
+ }, itemDataEl, defer.resolve);
break;
default:
break;
}
});
- htmlBuiltPromise.resolve();
}
- htmlBuiltPromise.done(function () {
+ return $.when.apply($, htmlBuiltPromises).done(function () {
self.$el.find(".condition-attr").wrapAll("");
});
-
- return htmlBuiltPromise;
},
setDefaultJsonValues (schema) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/LegacyListItemView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/LegacyListItemView.js
index da02fc99b8..bdbef2260f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/LegacyListItemView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/LegacyListItemView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils"
@@ -31,7 +32,7 @@ define([
var self = this;
- UIUtils.fillTemplateWithData(
+ return UIUtils.fillTemplateWithData(
"templates/admin/views/realms/authorization/policies/conditions/LegacyListItem.html",
this.data,
function () {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js
index 269ca0f894..ba7f8edbe9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageEnvironmentsView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView",
"org/forgerock/commons/ui/common/util/Constants"
@@ -95,13 +96,14 @@ define([
this.buttons.addOperator.hide();
}
- this.buildList();
- this.initSorting();
- this.identifyDroppableLogical();
+ this.buildList().then(() => {
+ this.initSorting();
+ this.identifyDroppableLogical();
- if (callback) {
- callback();
- }
+ if (callback) {
+ callback();
+ }
+ });
});
}
});
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js
index 0736c1e152..a448d5a631 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js
@@ -12,12 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
- * Portions copyright 2019 Open Source Solution Technology Corporation
+ * Portions copyright 2019-2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -86,43 +86,62 @@ define([
buildList () {
var self = this,
- newRule = null,
operators = _.pluck(this.data.operators, "title"),
properties = null;
function buildListItem (data, container) {
+ var promise = new $.Deferred().resolve();
+
if (_.isArray(data) === false) {
data = [data];
}
_.each(data, function (item) {
+ let newRule;
if (item && _.contains(operators, item.type)) {
-
newRule = new OperatorRulesView();
- newRule.render(self.data, container, self.idPrefix + self.idCount, (self.idCount === 0));
- newRule.setValue(item.type);
- self.idCount++;
-
+ promise = promise.then(() => {
+ const firstChild = (self.idCount === 0);
+ const itemID = self.idPrefix + self.idCount;
+ self.idCount++;
+ return newRule.render(self.data, container, itemID, firstChild);
+ }).then(() => {
+ newRule.setValue(item.type);
+ if (item && item[self.properties]) {
+ return buildListItem(item[self.properties], newRule.dropbox, item);
+ } else if (item && item[self.property]) {
+ return buildListItem(item[self.property], newRule.dropbox, item);
+ }
+ });
} else if (!_.isEmpty(item)) {
if (item.type === Constants.LEGACY) {
newRule = new LegacyListItemView();
- newRule.render(item, container, self.idCount);
+ promise = promise.then(() => {
+ const itemID = self.idCount;
+ self.idCount++;
+ return newRule.render(item, container, itemID);
+ });
} else {
newRule = self.getNewRule();
- properties = self.getProperties();
- newRule.render(properties, container, self.idCount, item);
- newRule.createListItem(properties, newRule.$el);
+ promise = promise.then(() => {
+ properties = self.getProperties();
+ const itemID = self.idCount;
+ self.idCount++;
+ return newRule.render(properties, container, itemID, item).then(() => {
+ newRule.createListItem(properties, newRule.$el);
+ if (item && item[self.properties]) {
+ return buildListItem(item[self.properties], newRule.dropbox, item);
+ } else if (item && item[self.property]) {
+ return buildListItem(item[self.property], newRule.dropbox, item);
+ }
+ });
+ });
}
-
- self.idCount++;
}
- if (item && item[self.properties]) {
- buildListItem(item[self.properties], newRule.dropbox, item);
- } else if (item && item[self.property]) {
- buildListItem(item[self.property], newRule.dropbox, item);
- }
});
+
+ return promise;
}
/*
@@ -138,8 +157,8 @@ define([
this.localEntity[this.properties] = [properties];
}
- buildListItem(this.localEntity, this.$el.find("ol#dropOffArea"), null);
- this.delegateEvents();
+ return buildListItem(this.localEntity, this.$el.find("ol#dropOffArea"), null)
+ .then(() => { self.delegateEvents(); });
},
initSorting () {
@@ -172,7 +191,7 @@ define([
self.setInactive(self.buttons.addCondition, false);
self.setInactive(self.buttons.addOperator, false);
- item.focus();
+ item.trigger("focus");
item.css({ width: item.width() }).addClass("dragged");
$("body").addClass("dragging");
@@ -212,7 +231,7 @@ define([
rule = $.extend(false, item, new OperatorRulesView());
rule.rebindElement();
}
- item.focus();
+ item.trigger("focus");
_super(item, container);
self.save();
});
@@ -260,21 +279,21 @@ define([
editRuleView = self.getNewRule(),
properties = self.getProperties(),
disabledConditions;
- editRuleView.render(properties, item.parent(), self.idCount, item.data().itemData);
+ editRuleView.render(properties, item.parent(), self.idCount, item.data().itemData, () => {
+ editRuleView.$el.addClass("editing");
+ item.before(editRuleView.$el);
- self.idCount++;
-
- editRuleView.$el.addClass("editing");
- item.before(editRuleView.$el);
+ self.setInactive(self.buttons.addCondition, true);
+ self.setInactive(self.buttons.addOperator, true);
- this.setInactive(this.buttons.addCondition, true);
- this.setInactive(this.buttons.addOperator, true);
+ disabledConditions = self.$el.find(".rule, .operator").not(".editing");
+ disabledConditions.addClass("editing-disabled");
+ disabledConditions.find("> select").prop("disabled", true);
- disabledConditions = this.$el.find(".rule, .operator").not(".editing");
- disabledConditions.addClass("editing-disabled");
- disabledConditions.find("> select").prop("disabled", true);
+ editRuleView.$el.find("select.type-selection:first").trigger("focus");
+ });
- editRuleView.$el.find("select.type-selection:first").focus();
+ self.idCount++;
},
editStop (item) {
@@ -387,7 +406,7 @@ define([
setFocus (e) {
e.stopPropagation();
var target = $(e.target).is("select") || $(e.target).is("input") ? e.target : e.currentTarget;
- $(target).focus();
+ $(target).trigger("focus");
},
getNewRule () {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js
index 392a4678cf..598f4a826b 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageSubjectsView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView",
"org/forgerock/commons/ui/common/util/Constants"
@@ -96,13 +97,14 @@ define([
this.buttons.addOperator.hide();
}
- this.buildList();
- this.initSorting();
- this.identifyDroppableLogical();
+ this.buildList().then(() => {
+ this.initSorting();
+ this.identifyDroppableLogical();
- if (callback) {
- callback();
- }
+ if (callback) {
+ callback();
+ }
+ });
});
}
});
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js
index 8d501de075..4c6dd97a6f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policies/conditions/OperatorRulesView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/UIUtils"
@@ -49,14 +50,14 @@ define([
this.setElement(element);
- UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
+ return UIUtils.fillTemplateWithData(this.template, this.data, function (tpl) {
self.$el.append(tpl);
self.setElement(`#operator${itemID}`);
self.select = self.$el.find("select");
self.delegateEvents();
- self.select.focus().trigger("change");
+ self.select.trigger("focus").trigger("change");
self.$el.data("logical", true);
self.dropbox = self.$el.find(".dropbox");
@@ -69,7 +70,7 @@ define([
},
setValue (value) {
- this.select.focus().val(value).trigger("change");
+ this.select.trigger("focus").val(value).trigger("change");
},
rebindElement () {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/EditPolicySetView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/EditPolicySetView.js
index 4545eecc6d..278d647697 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/EditPolicySetView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/EditPolicySetView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/admin/models/authorization/PolicySetModel",
"org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListView",
@@ -114,7 +115,7 @@ define([
self.$el.find("#policySetSettings").append(tpl);
self.populateResourceTypes();
FormHelper.setActiveTab(self);
- self.$el.find("#policySetSettings [autofocus]").focus();
+ self.$el.find("#policySetSettings [autofocus]").trigger("focus");
if (self.renderCallback) {
self.renderCallback();
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/PolicySetsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/PolicySetsView.js
index 1dbd3b7383..af1a74c35d 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/PolicySetsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/policySets/PolicySetsView.js
@@ -17,7 +17,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/EditResourceTypeView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/EditResourceTypeView.js
index 50fa536355..4c233d18cf 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/EditResourceTypeView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/EditResourceTypeView.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
@@ -125,7 +126,7 @@ define([
this.data,
function (tpl) {
self.$el.find("#resTypeSetting").html(tpl);
- self.$el.find("#resTypeSetting [autofocus]").focus();
+ self.$el.find("#resTypeSetting [autofocus]").trigger("focus");
});
},
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypeActionsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypeActionsView.js
index e8c8ee1215..7d101358ee 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypeActionsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypeActionsView.js
@@ -12,11 +12,12 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -33,8 +34,8 @@ define([
"click [data-add-item]": "addItem",
"keyup [data-add-item]": "addItem",
"keyup [data-editing-input]": "addItem",
- "click button[data-delete]": "deleteItem",
- "keyup button[data-delete]": "deleteItem"
+ "click button[data-delete-item]": "deleteItem",
+ "keyup button[data-delete-item]": "deleteItem"
},
render (data, el, callback) {
var self = this;
@@ -108,7 +109,7 @@ define([
this.updateEntity();
this.renderActionsTable(() => {
this.toggleAddButton(false);
- this.$el.find("[data-editing-input]").val("").focus();
+ this.$el.find("[data-editing-input]").val("").trigger("focus");
});
}
},
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypePatternsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypePatternsView.js
index 5c6cac40ff..7c5e873f14 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypePatternsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypePatternsView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/admin/views/realms/authorization/common/StripedListEditingView"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypesView.js
index 1cab7ada68..dfa82e1c42 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/authorization/resourceTypes/ResourceTypesView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardTasksView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardTasksView.js
index ba4ac7f4bf..6aface25d7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardTasksView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardTasksView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/admin/utils/RedirectToLegacyConsole"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardView.js
index cbd7c123fd..8adcbd7e0f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/admin/views/realms/dashboard/DashboardTasksView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/EditScriptView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/EditScriptView.js
index 3f8d6148ee..2fd54c7917 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/EditScriptView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/EditScriptView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"libs/codemirror/lib/codemirror",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/ScriptsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/ScriptsView.js
index 22b598630f..0dc52fbd44 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/ScriptsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/scripts/ScriptsView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/NewServiceView.jsm b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/NewServiceView.jsm
index 2ee785ba94..f323b21c4a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/NewServiceView.jsm
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/NewServiceView.jsm
@@ -16,7 +16,7 @@
import _ from "lodash";
import "bootstrap-tabdrop"; // jquery dependencies
-import $ from "jquery";
+import $ from "jquery-migrate";
import AbstractView from "org/forgerock/commons/ui/common/main/AbstractView";
import FlatJSONSchemaView from "org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView";
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/ServicesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/ServicesView.js
index 75d144b972..1dd09b3820 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/ServicesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/ServicesView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/Messages",
"org/forgerock/commons/ui/common/main/AbstractView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/SubSchemaListView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/SubSchemaListView.js
index 28a1731978..7157f7edfe 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/SubSchemaListView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/admin/views/realms/services/SubSchemaListView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/SelectComponent.jsm b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/SelectComponent.jsm
index ed83114000..28e07032e6 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/SelectComponent.jsm
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/SelectComponent.jsm
@@ -15,7 +15,7 @@
*/
import "selectize";
-import $ from "jquery";
+import $ from "jquery-migrate";
import UIUtils from "org/forgerock/commons/ui/common/util/UIUtils";
import { View } from "backbone";
import _ from "lodash";
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TabComponent.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TabComponent.js
index dad85e7907..d057146124 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TabComponent.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TabComponent.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/util/UIUtils",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TreeNavigation.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TreeNavigation.js
index 0518f635dc..9c7cc01f79 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TreeNavigation.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/TreeNavigation.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/util/ModuleLoader",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditRow.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditRow.js
index 941278fe4d..c3d7b19585 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditRow.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditRow.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -126,7 +127,7 @@ define([
},
focus () {
- this.$el.find("input:first").focus();
+ this.$el.find("input:first").trigger("focus");
},
addRow (event) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditTable.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditTable.js
index 5f86e072a5..2c298ecf8b 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditTable.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/components/table/InlineEditTable.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/commons/ui/common/util/UIUtils",
@@ -88,7 +89,7 @@ define([
this.currentlyEditedRow.renderInReadOnlyMode();
}
- row.renderInEditMode().focus();
+ row.renderInEditMode().trigger("focus");
this.currentlyEditedRow = row;
this.newRow.$el.hide();
};
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/ServerService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/ServerService.js
index ff003c2de9..f210f271c3 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/ServerService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/ServerService.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/common/services/ServerService
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/SiteConfigurationService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/SiteConfigurationService.js
index a56a3e7c19..f00786bff7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/SiteConfigurationService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/services/SiteConfigurationService.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/BackgridUtils.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/BackgridUtils.js
index 542a1b006e..b6d1dae621 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/BackgridUtils.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/BackgridUtils.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"moment",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Helpers.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Helpers.js
index 8831124d9e..c25d2684dd 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Helpers.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Helpers.js
@@ -17,7 +17,7 @@
/*global define*/
define([
- "jquery",
+ "jquery-migrate",
"handlebars",
"lodash",
"org/forgerock/openam/ui/common/util/ExternalLinks"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/NavigationHelper.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/NavigationHelper.js
index 4253bce042..8ebb285000 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/NavigationHelper.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/NavigationHelper.js
@@ -19,7 +19,7 @@
*/
define([
"lodash",
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/components/Navigation",
"org/forgerock/commons/ui/common/main/Router"
], function (_, $, Navigation, Router) {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Promise.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Promise.js
index 59aaf1a328..34db750ffd 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Promise.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/Promise.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/common/util/Promise
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash"
], ($, _) => ({
/**
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/ThemeManager.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/ThemeManager.js
index 94592d2e8d..4fb403d8f8 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/ThemeManager.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/util/ThemeManager.js
@@ -23,7 +23,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/openam/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/Configuration",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView.js
index 1aaf4f0cb6..0f0c7f0adc 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView.js
@@ -31,7 +31,7 @@
* @module org/forgerock/openam/ui/common/views/jsonSchema/FlatJSONSchemaView
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/openam/ui/common/models/JSONSchema",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/GroupedJSONSchemaView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/GroupedJSONSchemaView.js
index 3b2b51462e..3c6f5d3b7a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/GroupedJSONSchemaView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/GroupedJSONSchemaView.js
@@ -36,7 +36,7 @@
* @module org/forgerock/openam/ui/common/views/jsonSchema/GroupedJSONSchemaView
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/openam/ui/common/models/JSONSchema",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/JSONEditorView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/JSONEditorView.js
index d5d3a655cf..50e05acf60 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/JSONEditorView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/JSONEditorView.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"jsonEditor",
@@ -30,7 +31,7 @@ define([
function convertHelpBlocksToPopOvers (element) {
const template = "templates/common/jsonSchema/editors/_HelpPopover.html";
UIUtils.compileTemplate(template).then((html) => {
- $(element).find(".help-block").addClass("hidden-lg hidden-md hidden-sm").each((index, value) => {
+ $(element).find(".help-block").each((index, value) => {
const helpPopOver = $(html);
helpPopOver.popoverclickaway({
@@ -38,7 +39,7 @@ define([
html: true,
placement: "auto top",
content: value.innerHTML
- }).click((event) => {
+ }).on("click", (event) => {
event.preventDefault();
});
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/TogglableJSONEditorView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/TogglableJSONEditorView.js
index 5182506664..86cdaaff37 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/TogglableJSONEditorView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/common/views/jsonSchema/editors/TogglableJSONEditorView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"org/forgerock/openam/ui/common/models/JSONSchema",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/UserModel.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/UserModel.js
index 00f71d56e8..eab7cbac8e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/UserModel.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/UserModel.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractModel",
"org/forgerock/openam/ui/common/util/array/arrayify",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/anonymousProcess/AnonymousProcessView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/anonymousProcess/AnonymousProcessView.js
index 70fc490ba8..bf4b43f0b9 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/anonymousProcess/AnonymousProcessView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/anonymousProcess/AnonymousProcessView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/user/delegates/AnonymousProcessDelegate",
"org/forgerock/commons/ui/user/anonymousProcess/AnonymousProcessView",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/DeviceManagementService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/DeviceManagementService.js
index 7a34cfa423..d2923c28b4 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/DeviceManagementService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/DeviceManagementService.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/user/dashboard/services/DeviceManagementService
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/commons/ui/common/util/Constants",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/OAuthTokensService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/OAuthTokensService.js
index 631609570e..1933f3f81e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/OAuthTokensService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/OAuthTokensService.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/TrustedDevicesService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/TrustedDevicesService.js
index 113e8119bf..5b0d1ce19e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/TrustedDevicesService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/services/TrustedDevicesService.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationDevicesView.jsm b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationDevicesView.jsm
index ff35668964..6d8a1e2dde 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationDevicesView.jsm
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationDevicesView.jsm
@@ -14,7 +14,7 @@
* Copyright 2016 ForgeRock AS.
*/
-import $ from "jquery";
+import $ from "jquery-migrate";
import _ from "lodash";
import {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationFIDO2DevicesView.jsm b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationFIDO2DevicesView.jsm
index 91d175be9d..f91fa8154e 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationFIDO2DevicesView.jsm
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/AuthenticationFIDO2DevicesView.jsm
@@ -14,7 +14,7 @@
* Copyright 2019 Open Source Solution Technology Corporation
*/
-import $ from "jquery";
+import $ from "jquery-migrate";
import _ from "lodash";
import {
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DeviceDetailsDialog.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DeviceDetailsDialog.js
index c2611b0ce9..0300511376 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DeviceDetailsDialog.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DeviceDetailsDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/commons/ui/common/util/UIUtils"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DevicesSettingsDialog.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DevicesSettingsDialog.js
index 80c03b2cf0..fb131a505a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DevicesSettingsDialog.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/DevicesSettingsDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/commons/ui/common/components/Messages",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/FIDO2DeviceDetailsDialog.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/FIDO2DeviceDetailsDialog.js
index 3ced9f13a6..e0d68d3d97 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/FIDO2DeviceDetailsDialog.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/FIDO2DeviceDetailsDialog.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/commons/ui/common/util/UIUtils"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/MyApplicationsView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/MyApplicationsView.js
index efd14f11f4..d502c6d4b6 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/MyApplicationsView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/MyApplicationsView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/dashboard/services/MyApplicationsService"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/OAuthTokensView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/OAuthTokensView.js
index 18ce0302b3..8b8d253083 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/OAuthTokensView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/OAuthTokensView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/dashboard/services/OAuthTokensService"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/TrustedDevicesView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/TrustedDevicesView.js
index 59bd8b9b58..2ba59e91f6 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/TrustedDevicesView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/dashboard/views/TrustedDevicesView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/dashboard/services/TrustedDevicesService"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/LoginFailureView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/LoginFailureView.js
index f34487839c..2a30f1cc54 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/LoginFailureView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/LoginFailureView.js
@@ -17,7 +17,7 @@
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/login/RESTLoginHelper",
"org/forgerock/commons/ui/common/util/URIUtils"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTConfirmLoginView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTConfirmLoginView.js
index a1e151d47d..c558dd0f3d 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTConfirmLoginView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTConfirmLoginView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/openam/ui/user/login/RESTLoginHelper",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
index d4f96539df..e8c4981e47 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
@@ -16,7 +16,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
"org/forgerock/openam/ui/user/services/AuthNService",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginView.js
index d3dad9ecb0..218b5061a8 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginView.js
@@ -16,7 +16,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/services/AuthNService",
@@ -329,7 +329,7 @@ define([
redirectForm.append(
``);
});
- redirectForm.appendTo("body").submit();
+ redirectForm.appendTo("body").trigger("submit");
} else {
window.location.replace(redirectCallback.redirectUrl);
}
@@ -404,10 +404,10 @@ define([
if (this.$el.find("[name=loginRemember]").length !== 0 && login) {
this.$el.find("input[type=text]:first").val(login);
this.$el.find("[name=loginRemember]").attr("checked", "true");
- this.$el.find("[type=password]").focus();
+ this.$el.find("[type=password]").trigger("focus");
} else {
this.$el.find(":input:not([type='radio']):not([type='checkbox'])" +
- ":not([type='submit']):not([type='button']):first").focus();
+ ":not([type='submit']):not([type='button']):first").trigger("focus");
}
},
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLogoutView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLogoutView.js
index f2e0975ef1..95049eeeb0 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLogoutView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLogoutView.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/SessionExpiredView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/SessionExpiredView.js
index 77e863b661..7de6a97d34 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/SessionExpiredView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/SessionExpiredView.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/main/Configuration",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper.js
index 6f15a67c01..be9eba8fc3 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper.js
@@ -18,7 +18,7 @@
* @module org/forgerock/openam/ui/user/oauth2/OAuth2ConsentPageHelper
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/util/Constants",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/TokensView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/TokensView.js
index 925f1f14b4..bee5845bfe 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/TokensView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/oauth2/TokensView.js
@@ -20,10 +20,12 @@
* with the fields enclosed by brackets [] replaced by
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/openam/ui/user/services/TokenService",
"org/forgerock/commons/ui/common/main/EventManager",
@@ -123,7 +125,7 @@ define([
}" >`);
},
"fnRowCallback": (row, data) => {
- $(row).children().not(":first").click(function () {
+ $(row).children().not(":first").on("click", function () {
var id = data.id[0], htmlCode, table, temp = row, td;
tokensService.getTokenByID(function (tokenInfo) {
var output;
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/services/AuthNService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/services/AuthNService.js
index ef4526c8b9..d51c32b4a2 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/services/AuthNService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/services/AuthNService.js
@@ -12,10 +12,10 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2019 Open Source Solution Technology Corporation
+ * Portions copyright 2019-2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
@@ -78,7 +78,7 @@ define([
return obj.serviceCall(serviceCall).then((requirements) => requirements,
(jqXHR) => {
// some auth processes might throw an error fail immediately
- const errorBody = $.parseJSON(jqXHR.responseText);
+ const errorBody = JSON.parse(jqXHR.responseText);
// if the error body contains an authId, then we might be able to
// continue on after this error to the next module in the chain
if (errorBody.hasOwnProperty("authId")) {
@@ -86,15 +86,17 @@ define([
.then((requirements) => {
obj.resetProcess();
return requirements;
- }, () => errorBody
+ }, () => {
+ throw errorBody;
+ }
);
} else if (errorBody.code && errorBody.code === 400) {
- return {
+ throw {
message: errorBody.message,
type: Messages.TYPE_DANGER
};
}
- return errorBody;
+ throw errorBody;
});
};
obj.handleRequirements = function (requirements) {
@@ -123,7 +125,7 @@ define([
const processFailed = (reason) => {
const failedStage = requirementList.length;
obj.resetProcess();
- return [failedStage, reason];
+ throw [failedStage, reason];
};
const goToFailureUrl = (errorBody) => {
if (errorBody.detail && errorBody.detail.failureUrl) {
@@ -199,7 +201,7 @@ define([
}
Messages.addMessage({ message, type: Messages.TYPE_DANGER });
} else { // we have a 401 unauthorized response
- errorBody = $.parseJSON(jqXHR.responseText);
+ errorBody = JSON.parse(jqXHR.responseText);
// if the error body has an authId property, then we may be
// able to advance beyond this error
if (errorBody.hasOwnProperty("authId")) {
@@ -244,7 +246,9 @@ define([
.then((requirements) => {
obj.handleRequirements(requirements);
return requirements;
- }, (error) => error);
+ }, (error) => {
+ throw error;
+ });
} else {
return $.Deferred().resolve(requirementList[requirementList.length - 1]);
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAPolicyPermissionScope.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAPolicyPermissionScope.js
index 87bbe092bc..4a039141e7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAPolicyPermissionScope.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAPolicyPermissionScope.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone-relational"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAResourceSetWithPolicy.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAResourceSetWithPolicy.js
index 0316f24704..632ecef5c1 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAResourceSetWithPolicy.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/models/UMAResourceSetWithPolicy.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone-relational",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/services/UMAService.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/services/UMAService.js
index 9ab0568828..59d4b63acc 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/services/UMAService.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/services/UMAService.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractDelegate",
"org/forgerock/commons/ui/common/main/Configuration",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/backgrid/cells/PermissionsCell.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/backgrid/cells/PermissionsCell.js
index d515ada8bf..3b63e78491 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/backgrid/cells/PermissionsCell.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/backgrid/cells/PermissionsCell.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/openam/ui/common/util/BackgridUtils",
// jquery dependencies
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/history/ListHistory.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/history/ListHistory.js
index a6bc1ff14b..0a44e979dc 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/history/ListHistory.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/history/ListHistory.js
@@ -16,7 +16,7 @@
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/EditRequest.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/EditRequest.js
index 3c54bbdb97..634b2bab41 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/EditRequest.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/EditRequest.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"backbone",
"org/forgerock/commons/ui/common/backgrid/Backgrid",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/ListRequest.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/ListRequest.js
index 9a27b38f6e..85314491ba 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/ListRequest.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/request/ListRequest.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"backbone",
"backbone.paginator",
"backgrid-filter",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/BasePage.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/BasePage.js
index 2755b8c374..2a2676cf4a 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/BasePage.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/BasePage.js
@@ -16,7 +16,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView",
"backbone",
"backbone.paginator",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/LabelTreeNavigationView.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/LabelTreeNavigationView.js
index 438fbfb99f..1c1be27ec1 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/LabelTreeNavigationView.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/LabelTreeNavigationView.js
@@ -16,7 +16,7 @@
define([
"lodash",
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/Router",
"org/forgerock/openam/ui/common/components/TreeNavigation",
"org/forgerock/openam/ui/user/uma/services/UMAService"
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyLabelsPage.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyLabelsPage.js
index e3223f8607..53d851e2b7 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyLabelsPage.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyLabelsPage.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"backbone",
"org/forgerock/commons/ui/common/backgrid/Backgrid",
"org/forgerock/openam/ui/common/util/BackgridUtils",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyResourcesPage.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyResourcesPage.js
index 152924af80..398660b4cc 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyResourcesPage.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/MyResourcesPage.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/components/BootstrapDialog",
"org/forgerock/openam/ui/user/uma/views/resource/BasePage",
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/ResourcePage.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/ResourcePage.js
index 44bb17cba4..6f15cccbfa 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/ResourcePage.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/resource/ResourcePage.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"backbone",
@@ -399,7 +400,7 @@ define([
editLabels () {
var labelsSelect = this.getLabelSelectize();
labelsSelect.enable();
- labelsSelect.focus();
+ labelsSelect.trigger("focus");
this.$el.find("#editLabels").hide();
this.$el.find("#labels .selectize-control").removeClass("pull-left");
this.$el.find("button#saveLabels").prop("disabled", true);
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/CommonShare.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/CommonShare.js
index 0d859b84a2..156b76ff77 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/CommonShare.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/CommonShare.js
@@ -12,10 +12,11 @@
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2020 Open Source Solution Technology Corporation
*/
define([
- "jquery",
+ "jquery-migrate",
"lodash",
"org/forgerock/commons/ui/common/main/AbstractView",
"org/forgerock/commons/ui/common/backgrid/Backgrid",
@@ -243,7 +244,7 @@ define([
if (existing) {
scopes = existing.get("scopes").pluck("name");
- selectPermission[0].selectize.focus();
+ selectPermission[0].selectize.trigger("focus");
selectPermission[0].selectize.setValue(scopes);
}
diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/ShareCounter.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/ShareCounter.js
index 7b81db8eac..9f775a8894 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/ShareCounter.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/uma/views/share/ShareCounter.js
@@ -15,7 +15,7 @@
*/
define([
- "jquery",
+ "jquery-migrate",
"org/forgerock/commons/ui/common/main/AbstractView"
], function ($, AbstractView) {
var ShareCounter = AbstractView.extend({
diff --git a/openam-ui/openam-ui-ria/src/main/resources/index.html b/openam-ui/openam-ui-ria/src/main/resources/index.html
index f2c760e47c..5db110ed6f 100644
--- a/openam-ui/openam-ui-ria/src/main/resources/index.html
+++ b/openam-ui/openam-ui-ria/src/main/resources/index.html
@@ -29,6 +29,6 @@
}
};
-
+