You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by me...@apache.org on 2018/05/24 10:00:04 UTC
ranger git commit: RANGER-2102: Popup,
Date picker and Dropdown list of select field remains open on-click
of a back button from browser.
Repository: ranger
Updated Branches:
refs/heads/master 845133347 -> 95a8dce28
RANGER-2102: Popup, Date picker and Dropdown list of select field remains open on-click of a back button from browser.
Signed-off-by: Mehul Parikh <me...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/95a8dce2
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/95a8dce2
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/95a8dce2
Branch: refs/heads/master
Commit: 95a8dce283647f91d625a732c36db3c8c7434719
Parents: 8451333
Author: Dhaval Rajpara <dh...@gmail.com>
Authored: Tue May 22 10:30:08 2018 +0530
Committer: Mehul Parikh <me...@apache.org>
Committed: Thu May 24 15:29:33 2018 +0530
----------------------------------------------------------------------
security-admin/src/main/webapp/scripts/utils/XAUtils.js | 9 +++++++++
.../src/main/webapp/scripts/views/kms/KMSTableLayout.js | 1 +
.../scripts/views/permissions/ModulePermissionCreate.js | 1 +
.../webapp/scripts/views/policies/RangerPolicyCreate.js | 1 +
.../scripts/views/policies/RangerPolicyTableLayout.js | 2 +-
.../webapp/scripts/views/policymanager/ServiceLayout.js | 1 +
.../src/main/webapp/scripts/views/reports/AuditLayout.js | 3 +--
.../main/webapp/scripts/views/reports/UserAccessLayout.js | 2 +-
.../src/main/webapp/scripts/views/service/ServiceCreate.js | 3 ++-
.../src/main/webapp/scripts/views/users/UserTableLayout.js | 3 +--
10 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/utils/XAUtils.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
index cf33e18..5bec224 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js
@@ -1416,5 +1416,14 @@ define(function(require) {
document.body.removeChild(input);
e.currentTarget.title="Copied!";
};
+ //If view is closed, closed all new DOM element that added in DOM like popup, modal, date-selector and select-list etc.
+ XAUtils.removeUnwantedDomElement = function(){
+ $('.modal').remove();
+ $('.modal-backdrop').remove();
+ $('#select2-drop').select2('close');
+ $('.datepicker').remove();
+ $('.popover').remove();
+ $('.datetimepicker').remove();
+ };
return XAUtils;
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
index 6038895..d6521c6 100755
--- a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
@@ -390,6 +390,7 @@ define(function(require){
/** on close */
onClose: function(){
XAUtil.allowNavigation();
+ XAUtil.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionCreate.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionCreate.js b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionCreate.js
index 0d1c92f..2a66312 100644
--- a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionCreate.js
@@ -137,6 +137,7 @@ define(function(require){
},
/** on close */
onClose: function(){
+ XAUtil.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
index 4158309..9588fb7 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
@@ -298,6 +298,7 @@ define(function(require){
XAUtil.allowNavigation();
// clear Vent
Vent._events['resourceType:change']=[];
+ XAUtil.removeUnwantedDomElement();
}
});
return RangerPolicyCreate;
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
index 2e925a9..206bb96 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
@@ -513,7 +513,7 @@ define(function(require){
},
/** on close */
onClose: function(){
- $('.popover').remove();
+ XAUtil.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
index 118abf0..8a8e94a 100644
--- a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
@@ -265,6 +265,7 @@ define(function(require){
},
/** on close */
onClose: function(){
+ XAUtil.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
index b55d57e..697d33d 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
@@ -1786,8 +1786,7 @@ define(function(require) {
onClose : function() {
clearInterval(this.timerId);
clearInterval(this.clearTimeUpdateInterval);
- $('.datepicker').remove();
- $('.popover').remove();
+ XAUtils.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
index b463938..d5bad70 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
@@ -985,7 +985,7 @@ define(function(require) {'use strict';
},
/** on close */
onClose : function() {
- $('.popover').remove();
+ XAUtil.removeUnwantedDomElement();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
index 54444fb..c8ecdc3 100644
--- a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
+++ b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js
@@ -258,7 +258,8 @@ define(function(require){
},
/** on close */
onClose: function(){
- XAUtil.allowNavigation();
+ XAUtil.removeUnwantedDomElement();
+ XAUtil.allowNavigation();
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/95a8dce2/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js
index 840374f..60c25fa 100644
--- a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js
@@ -820,8 +820,7 @@ define(function(require){
/** on close */
onClose: function(){
XAUtil.allowNavigation();
- $('.fade.modal').hide();
- $('.modal-backdrop').hide();
+ XAUtil.removeUnwantedDomElement();
}
});