From b075f238a5d0898e5acc0b7f0d10bec6e02ddfd6 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Sun, 8 May 2016 22:39:51 -0400
Subject: [PATCH] NIFI-1564: - Addressing issue referencing the global jQuery
 variable in the content viewer. - This closes #421

---
 .../src/main/webapp/WEB-INF/jsp/header.jsp                    | 4 ++--
 .../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(-)

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 60bc908f3c..c679c3791f 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) {
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 a04120797c..ad540b88da 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) {
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 9c929a865a..6db1cc5b2b 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