You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/05/26 19:23:45 UTC
nifi git commit: NIFI-1564: - Addressing issue referencing the global
jQuery variable in the content viewer. - This closes #421
Repository: nifi
Updated Branches:
refs/heads/master a0ff2f7a9 -> b075f238a
NIFI-1564:
- Addressing issue referencing the global jQuery variable in the content viewer.
- This closes #421
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b075f238
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b075f238
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b075f238
Branch: refs/heads/master
Commit: b075f238a5d0898e5acc0b7f0d10bec6e02ddfd6
Parents: a0ff2f7
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun May 8 22:39:51 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu May 26 15:23:29 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/header.jsp | 4 ++--
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js | 2 +-
.../nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/b075f238/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
index 60bc908..c679c37 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -100,9 +100,9 @@
// if the selection has changesd, reload the page
if (currentLocation !== option.value) {
// get an access token if necessary
- var getAccessToken = $.Deferred(function (deferred) {
+ var getAccessToken = $$.Deferred(function (deferred) {
if (nf.Storage.hasItem('jwt')) {
- $.ajax({
+ $$.ajax({
type: 'POST',
url: '../nifi-api/access/ui-extension-token'
}).done(function (token) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/b075f238/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js
index a041207..ad540b8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js
@@ -18,7 +18,7 @@
/**
* Performs ajax setup for use within NiFi.
*/
-$(document).ready(function () {
+$(document).ready(function ($) {
// include jwt when possible
$.ajaxSetup({
'beforeSend': function(xhr) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/b075f238/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js
index 9c929a8..6db1cc5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js
@@ -19,7 +19,7 @@
* Captures keydown on the window to ensure certain keystrokes are handled in a consistent manner, particularly those
* that can lead to browser navigation/reload.
*/
-$(document).ready(function () {
+$(document).ready(function ($) {
// setup a listener to ensure keystrokes are being overridden in a consistent manner
$(window).on('keydown', function (evt) {
// consider escape, before checking dialogs