Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1564: 

- Addressing issue referencing the global jQuery variable in the content viewer.
- This closes #421
This commit is contained in:
Matt Gilman 2016-05-08 22:39:51 -04:00
parent a0ff2f7a9f
commit b075f238a5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
View File

@ -100,9 +100,9 @@
// if the selection has changesd, reload the page // if the selection has changesd, reload the page
if (currentLocation !== option.value) { if (currentLocation !== option.value) {
// get an access token if necessary // get an access token if necessary
var getAccessToken = $.Deferred(function (deferred) { var getAccessToken = $$.Deferred(function (deferred) {
if (nf.Storage.hasItem('jwt')) { if (nf.Storage.hasItem('jwt')) {
$.ajax({ $$.ajax({
type: 'POST', type: 'POST',
url: '../nifi-api/access/ui-extension-token' url: '../nifi-api/access/ui-extension-token'
}).done(function (token) { }).done(function (token) {

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ajax-setup.js
View File

@ -18,7 +18,7 @@
/** /**
* Performs ajax setup for use within NiFi. * Performs ajax setup for use within NiFi.
*/ */
$(document).ready(function () { $(document).ready(function ($) {
// include jwt when possible // include jwt when possible
$.ajaxSetup({ $.ajaxSetup({
'beforeSend': function(xhr) { 'beforeSend': function(xhr) {

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-universal-capture.js
View File

@ -19,7 +19,7 @@
* Captures keydown on the window to ensure certain keystrokes are handled in a consistent manner, particularly those * Captures keydown on the window to ensure certain keystrokes are handled in a consistent manner, particularly those
* that can lead to browser navigation/reload. * 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 // setup a listener to ensure keystrokes are being overridden in a consistent manner
$(window).on('keydown', function (evt) { $(window).on('keydown', function (evt) {
// consider escape, before checking dialogs // consider escape, before checking dialogs