Repository: nifi Updated Branches: refs/heads/0.x 92d648ab4 -> 84fcc0c8d
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/84fcc0c8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/84fcc0c8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/84fcc0c8 Branch: refs/heads/0.x Commit: 84fcc0c8d1ab3ec89dc5aa16807c733ca92e32c1 Parents: 92d648a Author: Matt Gilman <[email protected]> Authored: Sun May 8 22:39:51 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu May 26 15:24:03 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/84fcc0c8/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/84fcc0c8/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/84fcc0c8/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
