[3/7] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line ret
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index 864eb70..f181016 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -112,14 +112,14 @@ nf.BulletinBoard = (function () {
type: 'GET',
url: config.urls.controllerAbout,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var aboutDetails = response.about;
var bulletinBoardTitle = aboutDetails.title + ' Bulletin Board';
// set the document title and the about title
document.title = bulletinBoardTitle;
$('#bulletin-board-header-text').text(bulletinBoardTitle);
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
// get the banners if we're not in the shell
var loadBanners = $.Deferred(function (deferred) {
@@ -128,7 +128,7 @@ nf.BulletinBoard = (function () {
type: 'GET',
url: config.urls.banners,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// ensure the banners response is specified
if (nf.Common.isDefinedAndNotNull(response.banners)) {
if
(nf.Common.isDefinedAndNotNull(response.banners.headerText)
response.banners.headerText !== '') {
@@ -160,7 +160,7 @@ nf.BulletinBoard = (function () {
}
deferred.resolve();
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
nf.Common.handleAjaxError(xhr, status, error);
deferred.reject();
});
@@ -170,9 +170,9 @@ nf.BulletinBoard = (function () {
});
return $.Deferred(function (deferred) {
-$.when(getTitle, loadBanners).then(function () {
+$.when(getTitle, loadBanners).done(function () {
deferred.resolve();
-}, function () {
+}).fail(function () {
deferred.reject();
});
}).promise();
@@ -294,7 +294,7 @@ nf.BulletinBoard = (function () {
url: config.urls.bulletinBoard,
data: data,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// ensure the bulletin board was specified
if (nf.Common.isDefinedAndNotNull(response.bulletinBoard)) {
var bulletinBoard = response.bulletinBoard;
@@ -369,7 +369,7 @@ nf.BulletinBoard = (function () {
bulletinContainer.prepend('div
class=bulletin-action#8230;/div');
}
}
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
// likely caused by a invalid regex
if (xhr.status === 404) {
$('#bulletin-error-message').text(xhr.responseText).show();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index f73545d..dc8ca31 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -40,10 +40,10 @@ nf.Actions = (function () {
url: uri,
data: data,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// update the revision
nf.Client.setRevision(response.revision);
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
if (xhr.status === 400 || xhr.status === 404 || xhr.status ===
409) {
nf.Dialog.showOkDialog({
dialogContent: nf.Common.escapeHtml(xhr.responseText),
@@ -86,12 +86,14 @@ nf.Actions
[5/7] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line ret
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
index d06749e..938d85e 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
@@ -1,420 +1,11 @@
/*
* jQuery MiniColors: A tiny color picker built on jQuery
*
- * Copyright Cory LaViska for A Beautiful Site, LLC.
(http://www.abeautifulsite.net/)
+ * Copyright: Cory LaViska for A Beautiful Site, LLC
*
- * Licensed under the MIT license: http://opensource.org/licenses/MIT
+ * Contributions and bug reports: https://github.com/claviska/jquery-minicolors
*
- */jQuery function (e) {
-function t(t, n) {
-var r = e('div class=minicolors /'), i = e.minicolors.defaults;
-if (t.data(minicolors-initialized))
-return;
-n = e.extend(!0, {}, i, n);
-r.addClass(minicolors-theme- +
n.theme).toggleClass(minicolors-with-opacity, n.opacity);
-n.position !== undefined e.each(n.position.split( ), function () {
-r.addClass(minicolors-position- + this)
-});
-t.addClass(minicolors-input).data(minicolors-initialized,
!1).data(minicolors-settings, n).prop(size, 7).wrap(r).after('div
class=minicolors-panel minicolors-slider-' + n.control + '' + 'div
class=minicolors-slider' + 'div class=minicolors-picker/div' +
/div + 'div class=minicolors-opacity-slider' + 'div
class=minicolors-picker/div' + /div + 'div class=minicolors-grid'
+ 'div class=minicolors-grid-inner/div' + 'div
class=minicolors-pickerdiv/div/div' + /div + /div);
-if (!n.inline) {
-t.after('span class=minicolors-swatchspan
class=minicolors-swatch-color/span/span');
-t.next(.minicolors-swatch).on(click, function (e) {
-e.preventDefault();
-t.focus()
-})
-}
-t.parent().find(.minicolors-panel).on(selectstart, function () {
-return!1
-}).end();
-n.inline t.parent().addClass(minicolors-inline);
-u(t, !1);
-t.data(minicolors-initialized, !0)
-}
-function n(e) {
-var t = e.parent();
-
e.removeData(minicolors-initialized).removeData(minicolors-settings).removeProp(size).removeClass(minicolors-input);
-t.before(e).remove()
-}
-function r(e) {
-var t = e.parent(), n = t.find(.minicolors-panel), r =
e.data(minicolors-settings);
-if (!e.data(minicolors-initialized) || e.prop(disabled) ||
t.hasClass(minicolors-inline) || t.hasClass(minicolors-focus))
-return;
-i();
-t.addClass(minicolors-focus);
-n.stop(!0, !0).fadeIn(r.showSpeed, function () {
-r.show r.show.call(e.get(0))
-})
-}
-function i() {
-e(.minicolors-focus).each(function () {
-var t = e(this), n = t.find(.minicolors-input), r =
t.find(.minicolors-panel), i = n.data(minicolors-settings);
-r.fadeOut(i.hideSpeed, function () {
-i.hide i.hide.call(n.get(0));
-t.removeClass(minicolors-focus)
-})
-})
-}
-function s(e, t, n) {
-var r = e.parents(.minicolors).find(.minicolors-input), i =
r.data(minicolors-settings), s = e.find([class$=-picker]), u =
e.offset().left, a = e.offset().top, f = Math.round(t.pageX - u), l =
Math.round(t.pageY - a), c = n ? i.animationSpeed : 0, h, p, d, v;
-if (t.originalEvent.changedTouches) {
-f = t.originalEvent.changedTouches[0].pageX - u;
-l = t.originalEvent.changedTouches[0].pageY - a
-}
-f 0 (f = 0);
-l 0 (l = 0);
-f e.width() (f = e.width());
-l e.height() (l = e.height());
-if (e.parent().is(.minicolors-slider-wheel)
s.parent().is(.minicolors-grid)) {
-h = 75 - f;
-p = 75 - l;
-d = Math.sqrt(h * h + p * p);
-v = Math.atan2(p, h);
-v 0 (v += Math.PI * 2);
-if (d 75) {
-d = 75;
-f = 75 - 75 * Math.cos(v);
-l = 75 - 75 * Math.sin(v)
-}
-f = Math.round(f);
-l = Math.round(l)
-}
-e.is(.minicolors-grid) ? s.stop(!0).animate({top: l + px, left: f
+ px}, c, i.animationEasing, function () {
-o(r, e)
-}) : s.stop(!0).animate({top: l + px}, c, i.animationEasing,
[7/7] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line ret
NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line returns between public methods. - Upgrading jquery.form and jquery.minicolors. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2965258e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2965258e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2965258e Branch: refs/heads/nifi-27 Commit: 2965258e5da192b8a54dc36f84089be90bc0f1f7 Parents: fc78752 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 08:42:13 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 08:42:13 2014 -0500 -- .../webapp/WEB-INF/pages/bulletin-board.jsp | 3 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp| 3 +- .../src/main/webapp/WEB-INF/pages/cluster.jsp | 1 - .../src/main/webapp/WEB-INF/pages/counters.jsp | 1 - .../src/main/webapp/WEB-INF/pages/history.jsp | 1 - .../main/webapp/WEB-INF/pages/provenance.jsp| 1 - .../src/main/webapp/WEB-INF/pages/summary.jsp | 1 - .../src/main/webapp/WEB-INF/pages/templates.jsp | 3 +- .../src/main/webapp/WEB-INF/pages/users.jsp | 1 - .../src/main/webapp/js/jquery/jquery.form.js| 1118 -- .../main/webapp/js/jquery/jquery.form.min.js|11 + .../js/jquery/minicolors/jquery.minicolors.css |40 +- .../jquery/minicolors/jquery.minicolors.min.js | 421 +- .../jquery/ui-smoothness/jquery-ui-1.10.4.css | 1178 -- .../js/jquery/ui-smoothness/jquery-ui-1.10.4.js | 15008 - .../js/nf/bulletin-board/nf-bulletin-board.js |16 +- .../src/main/webapp/js/nf/canvas/nf-actions.js |65 +- .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 1 + .../webapp/js/nf/canvas/nf-canvas-header.js |12 +- .../webapp/js/nf/canvas/nf-canvas-toolbar.js| 1 + .../webapp/js/nf/canvas/nf-canvas-toolbox.js|45 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js |73 +- .../src/main/webapp/js/nf/canvas/nf-canvas.js |59 +- .../main/webapp/js/nf/canvas/nf-clipboard.js| 4 + .../main/webapp/js/nf/canvas/nf-connectable.js | 1 + .../js/nf/canvas/nf-connection-configuration.js |43 +- .../main/webapp/js/nf/canvas/nf-connection.js |20 +- .../main/webapp/js/nf/canvas/nf-context-menu.js | 2 + .../main/webapp/js/nf/canvas/nf-draggable.js| 9 +- .../src/main/webapp/js/nf/canvas/nf-funnel.js | 8 + .../src/main/webapp/js/nf/canvas/nf-go-to.js|50 +- .../src/main/webapp/js/nf/canvas/nf-graph.js| 6 + .../js/nf/canvas/nf-label-configuration.js | 5 +- .../src/main/webapp/js/nf/canvas/nf-label.js|14 +- .../js/nf/canvas/nf-port-configuration.js | 5 +- .../main/webapp/js/nf/canvas/nf-port-details.js | 1 + .../src/main/webapp/js/nf/canvas/nf-port.js |10 + .../nf/canvas/nf-process-group-configuration.js | 5 +- .../js/nf/canvas/nf-process-group-details.js| 1 + .../webapp/js/nf/canvas/nf-process-group.js |10 + .../js/nf/canvas/nf-processor-configuration.js |13 +- .../js/nf/canvas/nf-processor-property-table.js |14 + .../main/webapp/js/nf/canvas/nf-processor.js|11 + .../main/webapp/js/nf/canvas/nf-registration.js | 4 +- .../nf-remote-process-group-configuration.js| 5 +- .../canvas/nf-remote-process-group-details.js | 1 + .../nf/canvas/nf-remote-process-group-ports.js |13 +- .../js/nf/canvas/nf-remote-process-group.js |10 + .../nf/canvas/nf-secure-port-configuration.js | 5 +- .../js/nf/canvas/nf-secure-port-details.js | 1 + .../main/webapp/js/nf/canvas/nf-selectable.js | 2 + .../src/main/webapp/js/nf/canvas/nf-settings.js |13 +- .../src/main/webapp/js/nf/canvas/nf-snippet.js | 6 + .../src/main/webapp/js/nf/canvas/nf-storage.js | 3 + .../webapp/js/nf/cluster/nf-cluster-table.js|31 +- .../src/main/webapp/js/nf/cluster/nf-cluster.js |12 +- .../webapp/js/nf/counters/nf-counters-table.js |11 +- .../main/webapp/js/nf/counters/nf-counters.js |12 +- .../webapp/js/nf/history/nf-history-model.js| 4 +- .../webapp/js/nf/history/nf-history-table.js| 7 +- .../src/main/webapp/js/nf/history/nf-history.js |12 +- .../src/main/webapp/js/nf/nf-common.js |40 + .../main/webapp/js/nf/nf-connection-details.js |19 +- .../src/main/webapp/js/nf/nf-dialog.js | 1 + .../main/webapp/js/nf/nf-processor-details.js | 5 +- .../src/main/webapp/js/nf/nf-shell.js | 1 + .../src/main/webapp/js/nf/nf-status-history.js |40 +- .../js/nf/provenance/nf-provenance-lineage.js |17 +- .../js/nf/provenance/nf-provenance-table.js |
[4/7] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line ret
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
deleted file mode 100755
index ecac757..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
+++ /dev/null
@@ -1,15008 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-12-08
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( $, undefined ) {
-
-var uuid = 0,
- runiqueId = /^ui-id-\d+$/;
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
-$.extend( $.ui, {
- version: 1.10.4,
-
- keyCode: {
- BACKSPACE: 8,
- COMMA: 188,
- DELETE: 46,
- DOWN: 40,
- END: 35,
- ENTER: 13,
- ESCAPE: 27,
- HOME: 36,
- LEFT: 37,
- NUMPAD_ADD: 107,
- NUMPAD_DECIMAL: 110,
- NUMPAD_DIVIDE: 111,
- NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106,
- NUMPAD_SUBTRACT: 109,
- PAGE_DOWN: 34,
- PAGE_UP: 33,
- PERIOD: 190,
- RIGHT: 39,
- SPACE: 32,
- TAB: 9,
- UP: 38
- }
-});
-
-// plugins
-$.fn.extend({
- focus: (function( orig ) {
- return function( delay, fn ) {
- return typeof delay === number ?
- this.each(function() {
- var elem = this;
- setTimeout(function() {
- $( elem ).focus();
- if ( fn ) {
- fn.call( elem );
- }
- }, delay );
- }) :
- orig.apply( this, arguments );
- };
- })( $.fn.focus ),
-
- scrollParent: function() {
- var scrollParent;
- if (($.ui.ie
(/(static|relative)/).test(this.css(position))) ||
(/absolute/).test(this.css(position))) {
- scrollParent = this.parents().filter(function() {
- return
(/(relative|absolute|fixed)/).test($.css(this,position))
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
- }).eq(0);
- } else {
- scrollParent = this.parents().filter(function() {
- return
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
- }).eq(0);
- }
-
- return (/fixed/).test(this.css(position)) ||
!scrollParent.length ? $(document) : scrollParent;
- },
-
- zIndex: function( zIndex ) {
- if ( zIndex !== undefined ) {
- return this.css( zIndex, zIndex );
- }
-
- if ( this.length ) {
- var elem = $( this[ 0 ] ), position, value;
- while ( elem.length elem[ 0 ] !== document ) {
- // Ignore z-index if position is set to a value
where z-index is ignored by the browser
- // This makes behavior of this function
consistent across browsers
- // WebKit always returns auto if the element is
positioned
-
[jira] [Created] (NIFI-173) nar maven plugin needs to create a directory with a more unique name than depdencies
Joseph Witt created NIFI-173: Summary: nar maven plugin needs to create a directory with a more unique name than depdencies Key: NIFI-173 URL: https://issues.apache.org/jira/browse/NIFI-173 Project: Apache NiFi Issue Type: Sub-task Components: Tools Reporter: Joseph Witt Assignee: Joseph Witt Fix For: 0.0.1 the nar maven plugin seems to be creating build issues on some platforms since it makes a directory called 'dependencies' in the nar and the apache stuff is causing there to be also be a 'DEPENDENCIES' dir. So needing a more unique name. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248322#comment-14248322 ] ASF subversion and git services commented on NIFI-27: - Commit 888d1bafc784e6052b14c4e35f1e1c63c246f743 in incubator-nifi's branch refs/heads/nifi-27 from [~mcgilman] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=888d1ba ] NIFI-27: - Upgrading jQuery and jQuery UI. - Updating autocomplete as appropriate. - Restoring line returns between methods. Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[1/9] incubator-nifi git commit: NIFI-56: Made test single-threaded
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-169 614349bdf - 8fb78d2a5
NIFI-56: Made test single-threaded
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/73cc6cbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/73cc6cbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/73cc6cbe
Branch: refs/heads/NIFI-169
Commit: 73cc6cbe284faab9a91b4816197a105524b1df41
Parents: 9ccbf8b
Author: Mark Payne marka...@hotmail.com
Authored: Mon Dec 15 13:09:08 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Mon Dec 15 13:09:08 2014 -0500
--
.../java/org/apache/nifi/processors/standard/TestScanContent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/73cc6cbe/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
--
diff --git
a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
b/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
index 499fb3e..9079f82 100644
---
a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
+++
b/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
@@ -55,7 +55,7 @@ public class TestScanContent {
Files.write(dictionaryPath, termBytes, StandardOpenOption.CREATE,
StandardOpenOption.WRITE);
final TestRunner runner = TestRunners.newTestRunner(new
ScanContent());
-runner.setThreadCount(3);
+runner.setThreadCount(1);
runner.setProperty(ScanContent.DICTIONARY,
dictionaryPath.toString());
runner.setProperty(ScanContent.DICTIONARY_ENCODING,
ScanContent.BINARY_ENCODING);
[3/9] incubator-nifi git commit: NIFI-49: include name of default value if it is not allowed in a property descriptor
NIFI-49: include name of default value if it is not allowed in a property
descriptor
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f0bea5c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f0bea5c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f0bea5c1
Branch: refs/heads/NIFI-169
Commit: f0bea5c156fa0bfc1d7773ae45ea73ba594ba77a
Parents: e04a55d
Author: Mark Payne marka...@hotmail.com
Authored: Mon Dec 15 13:21:59 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Mon Dec 15 13:21:59 2014 -0500
--
.../main/java/org/apache/nifi/components/PropertyDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0bea5c1/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
--
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index c95d449..19600ab 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -425,7 +425,7 @@ public final class PropertyDescriptor implements
ComparablePropertyDescriptor
throw new IllegalStateException(Must specify a name);
}
if (!isValueAllowed(defaultValue)) {
-throw new IllegalStateException(Default value is not in the
set of allowable values);
+throw new IllegalStateException(Default value ' +
defaultValue + ' is not in the set of allowable values);
}
return new PropertyDescriptor(this);
[5/9] incubator-nifi git commit: NIFI-49: Included patch from Philip Young to include name of default vlaue when not allowed as a property descriptor value
NIFI-49: Included patch from Philip Young to include name of default vlaue when not allowed as a property descriptor value Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ddfa621d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ddfa621d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ddfa621d Branch: refs/heads/NIFI-169 Commit: ddfa621dab4f6614e426314e0685106586e08c9f Parents: 1316042 f0bea5c Author: Mark Payne marka...@hotmail.com Authored: Mon Dec 15 13:29:35 2014 -0500 Committer: Mark Payne marka...@hotmail.com Committed: Mon Dec 15 13:29:35 2014 -0500 -- --
[2/9] incubator-nifi git commit: NIFI-43: Do not throw InvocationTargetException if it is wrapping a RuntimeException; instead just throw the RuntimeException
NIFI-43: Do not throw InvocationTargetException if it is wrapping a
RuntimeException; instead just throw the RuntimeException
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e04a55d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e04a55d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e04a55d3
Branch: refs/heads/NIFI-169
Commit: e04a55d3a5097d1ae3ff5c5a4c8f8ad1e1dc56b9
Parents: 73cc6cb
Author: Mark Payne marka...@hotmail.com
Authored: Mon Dec 15 13:14:42 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Mon Dec 15 13:14:42 2014 -0500
--
.../org/apache/nifi/util/ReflectionUtils.java | 72 +++-
1 file changed, 40 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e04a55d3/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
index 9d52eb3..e15e00a 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
@@ -42,43 +42,51 @@ public class ReflectionUtils {
* @throws IllegalAccessException
*/
public static void invokeMethodsWithAnnotation(final Class? extends
Annotation annotation, final Object instance, final Object... args) throws
IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-for (final Method method : instance.getClass().getMethods()) {
-if (method.isAnnotationPresent(annotation)) {
-final boolean isAccessible = method.isAccessible();
-method.setAccessible(true);
-
-try {
-final Class?[] argumentTypes =
method.getParameterTypes();
-if (argumentTypes.length args.length) {
-throw new
IllegalArgumentException(String.format(Unable to invoke method %1$s on %2$s
because method expects %3$s parameters but only %4$s were given,
-method.getName(), instance,
argumentTypes.length, args.length));
-}
-
-for (int i = 0; i argumentTypes.length; i++) {
-final Class? argType = argumentTypes[i];
-if (!argType.isAssignableFrom(args[i].getClass())) {
-throw new IllegalArgumentException(String.format(
-Unable to invoke method %1$s on %2$s
because method parameter %3$s is expected to be of type %4$s but argument
passed was of type %5$s,
-method.getName(), instance, i, argType,
args[i].getClass()));
+try {
+for (final Method method : instance.getClass().getMethods()) {
+if (method.isAnnotationPresent(annotation)) {
+final boolean isAccessible = method.isAccessible();
+method.setAccessible(true);
+
+try {
+final Class?[] argumentTypes =
method.getParameterTypes();
+if (argumentTypes.length args.length) {
+throw new
IllegalArgumentException(String.format(Unable to invoke method %1$s on %2$s
because method expects %3$s parameters but only %4$s were given,
+method.getName(), instance,
argumentTypes.length, args.length));
}
-}
-
-if (argumentTypes.length == args.length) {
-method.invoke(instance, args);
-} else {
-final Object[] argsToPass = new
Object[argumentTypes.length];
-for (int i = 0; i argsToPass.length; i++) {
-argsToPass[i] = args[i];
+
+for (int i = 0; i argumentTypes.length; i++) {
+final Class? argType = argumentTypes[i];
+if (!argType.isAssignableFrom(args[i].getClass()))
{
+throw new
IllegalArgumentException(String.format(
+Unable to invoke method %1$s on %2$s
because method parameter %3$s is expected to be of type %4$s but argument
passed was of type %5$s,
+method.getName(), instance, i,
[7/9] incubator-nifi git commit: NIFI-35: Provide an EventReporter to the FlowFileSwapManager and provide events for any errors
NIFI-35: Provide an EventReporter to the FlowFileSwapManager and provide events
for any errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1cc3ce57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1cc3ce57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1cc3ce57
Branch: refs/heads/NIFI-169
Commit: 1cc3ce57556eb7cf9a5f94b269eb24b284e518eb
Parents: 9e60aa0
Author: Mark Payne marka...@hotmail.com
Authored: Mon Dec 15 14:28:11 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Mon Dec 15 14:28:11 2014 -0500
--
.../nifi/controller/FileSystemSwapManager.java | 33 +++-
.../apache/nifi/controller/FlowController.java | 20 +++-
.../repository/FlowFileSwapManager.java | 5 ++-
3 files changed, 41 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1cc3ce57/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
index 3af2098..ad95f8e 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FileSystemSwapManager.java
@@ -61,11 +61,12 @@ import
org.apache.nifi.controller.repository.StandardFlowFileRecord;
import org.apache.nifi.controller.repository.claim.ContentClaim;
import org.apache.nifi.controller.repository.claim.ContentClaimManager;
import org.apache.nifi.engine.FlowEngine;
+import org.apache.nifi.events.EventReporter;
import org.apache.nifi.io.BufferedOutputStream;
import org.apache.nifi.processor.QueueSize;
+import org.apache.nifi.reporting.Severity;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.NiFiProperties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,10 +81,12 @@ public class FileSystemSwapManager implements
FlowFileSwapManager {
public static final int MINIMUM_SWAP_COUNT = 1;
private static final Pattern SWAP_FILE_PATTERN =
Pattern.compile(\\d+-.+\\.swap);
public static final int SWAP_ENCODING_VERSION = 6;
+public static final String EVENT_CATEGORY = Swap FlowFiles;
private final ScheduledExecutorService swapQueueIdentifierExecutor;
private final ScheduledExecutorService swapInExecutor;
private volatile FlowFileRepository flowFileRepository;
+private volatile EventReporter eventReporter;
// Maintains a mapping of FlowFile Queue to the a QueueLockWrapper, which
provides queue locking and necessary state for swapping back in
private final ConcurrentMapFlowFileQueue, QueueLockWrapper swapMap = new
ConcurrentHashMap();
@@ -129,9 +132,10 @@ public class FileSystemSwapManager implements
FlowFileSwapManager {
}
}
-public synchronized void start(final FlowFileRepository
flowFileRepository, final QueueProvider connectionProvider, final
ContentClaimManager claimManager) {
+public synchronized void start(final FlowFileRepository
flowFileRepository, final QueueProvider connectionProvider, final
ContentClaimManager claimManager, final EventReporter eventReporter) {
this.claimManager = claimManager;
this.flowFileRepository = flowFileRepository;
+this.eventReporter = eventReporter;
swapQueueIdentifierExecutor.scheduleWithFixedDelay(new
QueueIdentifier(connectionProvider), swapOutMillis, swapOutMillis,
TimeUnit.MILLISECONDS);
swapInExecutor.scheduleWithFixedDelay(new SwapInTask(), swapInMillis,
swapInMillis, TimeUnit.MILLISECONDS);
}
@@ -437,10 +441,15 @@ public class FileSystemSwapManager implements
FlowFileSwapManager {
}
if (!swapFile.delete()) {
-logger.warn(Swapped in FlowFiles from
file + swapFile.getAbsolutePath() + but failed to delete the file; this
file can be cleaned up manually);
+final String errMsg = Swapped in
FlowFiles from file + swapFile.getAbsolutePath() + but failed to delete the
file; this file should be cleaned up manually;
+logger.warn(errMsg);
+
eventReporter.reportEvent(Severity.WARNING, EVENT_CATEGORY, errMsg);
}
} catch (final Exception e) {
-
[8/9] incubator-nifi git commit: Merge branch 'develop' into NIFI-169
Merge branch 'develop' into NIFI-169 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3a4c6ed8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3a4c6ed8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3a4c6ed8 Branch: refs/heads/NIFI-169 Commit: 3a4c6ed887cd2e13aa861ed99028de33678bcbe8 Parents: 614349b 1cc3ce5 Author: joewitt joew...@apache.org Authored: Tue Dec 16 08:16:52 2014 -0500 Committer: joewitt joew...@apache.org Committed: Tue Dec 16 08:16:52 2014 -0500 -- .../nifi/controller/FileSystemSwapManager.java | 33 ++--- .../apache/nifi/controller/FlowController.java | 20 +++--- .../org/apache/nifi/util/ReflectionUtils.java | 72 +++- .../processors/standard/TestScanContent.java| 2 +- .../nifi/components/PropertyDescriptor.java | 2 +- .../repository/FlowFileSwapManager.java | 5 +- .../nifi/components/TestPropertyDescriptor.java | 59 7 files changed, 142 insertions(+), 51 deletions(-) --
[jira] [Commented] (NIFI-35) Failure to swap FlowFiles In/Out should result in system level bulletins
[ https://issues.apache.org/jira/browse/NIFI-35?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248398#comment-14248398 ] ASF subversion and git services commented on NIFI-35: - Commit 1cc3ce57556eb7cf9a5f94b269eb24b284e518eb in incubator-nifi's branch refs/heads/NIFI-169 from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=1cc3ce5 ] NIFI-35: Provide an EventReporter to the FlowFileSwapManager and provide events for any errors Failure to swap FlowFiles In/Out should result in system level bulletins Key: NIFI-35 URL: https://issues.apache.org/jira/browse/NIFI-35 Project: Apache NiFi Issue Type: Improvement Components: Core Framework Reporter: Matt Gilman Priority: Minor Fix For: 0.0.1 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-169) Better overall build process without using a shell script
[ https://issues.apache.org/jira/browse/NIFI-169?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248399#comment-14248399 ] ASF subversion and git services commented on NIFI-169: -- Commit 3a4c6ed887cd2e13aa861ed99028de33678bcbe8 in incubator-nifi's branch refs/heads/NIFI-169 from [~joewitt] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=3a4c6ed ] Merge branch 'develop' into NIFI-169 Better overall build process without using a shell script - Key: NIFI-169 URL: https://issues.apache.org/jira/browse/NIFI-169 Project: Apache NiFi Issue Type: Improvement Components: Tools Affects Versions: 0.0.1 Reporter: Karl Heinz Marbaise Fix For: 0.0.1 I would suggest to create a better build process which takes advantage of the multi module capabilities of Maven and furthermore of multi threading which can decrease the build time dramatically. Apart from that currently the build process is spreaded over different areas which are configured differently (differen plugin versions etc.) which leads not in a realiable build process. Furthermore this would make integration into a CI environment like Apache area simpler. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[07/27] incubator-nifi git commit: NIFI-132: Log to Processor's logger
NIFI-132: Log to Processor's logger
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2bcd1e65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2bcd1e65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2bcd1e65
Branch: refs/heads/nifi-27
Commit: 2bcd1e657a5a959fad6572b011924f07d995abe8
Parents: 74c7940
Author: Mark Payne marka...@hotmail.com
Authored: Thu Dec 11 09:45:24 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Thu Dec 11 09:45:24 2014 -0500
--
.../nifi/processors/standard/EvaluateXPath.java | 31 ++--
1 file changed, 28 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2bcd1e65/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
--
diff --git
a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
index 056f4fc..2f3f34b 100644
---
a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
+++
b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java
@@ -36,6 +36,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import javax.xml.namespace.QName;
+import javax.xml.transform.ErrorListener;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -50,6 +51,7 @@ import javax.xml.xpath.XPathFactoryConfigurationException;
import net.sf.saxon.lib.NamespaceConstant;
import net.sf.saxon.xpath.XPathEvaluator;
+
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
@@ -73,7 +75,6 @@ import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.InputStreamCallback;
import org.apache.nifi.processor.io.OutputStreamCallback;
import org.apache.nifi.util.ObjectHolder;
-
import org.xml.sax.InputSource;
@EventDriven
@@ -356,8 +357,7 @@ public class EvaluateXPath extends AbstractProcessor {
session.getProvenanceReporter().modifyContent(flowFile);
}
} else {
-logger.error(Failed to write XPath result for {} due to {};
routing original to 'failure', new Object[]{
-flowFile, error.get()});
+logger.error(Failed to write XPath result for {} due to {};
routing original to 'failure', new Object[]{flowFile, error.get()});
session.transfer(flowFile, REL_FAILURE);
}
}
@@ -377,7 +377,32 @@ public class EvaluateXPath extends AbstractProcessor {
props.setProperty(OutputKeys.OMIT_XML_DECLARATION, no);
transformer.setOutputProperties(props);
+final ProcessorLog logger = getLogger();
+
+final ObjectHolderTransformerException error = new
ObjectHolder(null);
+transformer.setErrorListener(new ErrorListener() {
+@Override
+public void warning(final TransformerException exception) throws
TransformerException {
+logger.warn(Encountered warning from XPath Engine: , new
Object[] {exception.toString(), exception});
+}
+
+@Override
+public void error(final TransformerException exception) throws
TransformerException {
+logger.error(Encountered error from XPath Engine: , new
Object[] {exception.toString(), exception});
+error.set(exception);
+}
+
+@Override
+public void fatalError(final TransformerException exception)
throws TransformerException {
+logger.error(Encountered warning from XPath Engine: , new
Object[] {exception.toString(), exception});
+error.set(exception);
+}
+});
+
transformer.transform(sourceNode, new StreamResult(out));
+if ( error.get() != null ) {
+throw error.get();
+}
}
private static class XPathValidator implements Validator {
[26/27] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a016bf47/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
index 91363b8..cdf4ae4 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
@@ -1,269 +1,259 @@
.minicolors {
-position: relative;
-}
-
-.minicolors-sprite {
-background-image:
url(data:image/png;base64,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
[jira] [Commented] (NIFI-49) If Processor's Property's Default Value is not allowed, the Exception thrown should indicate what the default value is
[ https://issues.apache.org/jira/browse/NIFI-49?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248432#comment-14248432 ] ASF subversion and git services commented on NIFI-49: - Commit ddfa621dab4f6614e426314e0685106586e08c9f in incubator-nifi's branch refs/heads/nifi-27 from [~markap14] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=ddfa621 ] NIFI-49: Included patch from Philip Young to include name of default vlaue when not allowed as a property descriptor value If Processor's Property's Default Value is not allowed, the Exception thrown should indicate what the default value is -- Key: NIFI-49 URL: https://issues.apache.org/jira/browse/NIFI-49 Project: Apache NiFi Issue Type: Improvement Components: Core Framework Reporter: Mark Payne Priority: Minor Fix For: 0.0.1 Attachments: defaultValue.patch Currently, we get the following error when the default value is not valid: ... Cause by: java.lang.IllegalStateException: Default value is not in the set of allowable values This should indicate what that Default Value actually is. This is particularly important if we have a collection of dynamically created Allowable Values and use the first one as the default, for example. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[19/27] incubator-nifi git commit: NIFI-49: include name of default value if it is not allowed in a property descriptor
NIFI-49: include name of default value if it is not allowed in a property
descriptor
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f0bea5c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f0bea5c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f0bea5c1
Branch: refs/heads/nifi-27
Commit: f0bea5c156fa0bfc1d7773ae45ea73ba594ba77a
Parents: e04a55d
Author: Mark Payne marka...@hotmail.com
Authored: Mon Dec 15 13:21:59 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Mon Dec 15 13:21:59 2014 -0500
--
.../main/java/org/apache/nifi/components/PropertyDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0bea5c1/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
--
diff --git
a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
index c95d449..19600ab 100644
--- a/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
+++ b/nifi-api/src/main/java/org/apache/nifi/components/PropertyDescriptor.java
@@ -425,7 +425,7 @@ public final class PropertyDescriptor implements
ComparablePropertyDescriptor
throw new IllegalStateException(Must specify a name);
}
if (!isValueAllowed(defaultValue)) {
-throw new IllegalStateException(Default value is not in the
set of allowable values);
+throw new IllegalStateException(Default value ' +
defaultValue + ' is not in the set of allowable values);
}
return new PropertyDescriptor(this);
[10/27] incubator-nifi git commit: NIFI-164: Add shutdown() method to ContentRepository and implement in FileSystemRepository and VolatileContentRepository to cleanup executors; call shutdown() from F
NIFI-164: Add shutdown() method to ContentRepository and implement in
FileSystemRepository and VolatileContentRepository to cleanup executors; call
shutdown() from FlowController shutdown method
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/55d4b1c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/55d4b1c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/55d4b1c0
Branch: refs/heads/nifi-27
Commit: 55d4b1c09990a9cff8a235fe65a0056879e6355a
Parents: 2bcd1e6
Author: Mark Payne marka...@hotmail.com
Authored: Fri Dec 12 10:00:40 2014 -0500
Committer: Mark Payne marka...@hotmail.com
Committed: Fri Dec 12 10:00:40 2014 -0500
--
.../main/java/org/apache/nifi/controller/FlowController.java | 4
.../nifi/controller/repository/FileSystemRepository.java | 6 ++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++
4 files changed, 21 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index 20c50b5..e1abe4e 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -1050,6 +1050,10 @@ public class FlowController implements EventAccess,
ControllerServiceProvider, H
processScheduler.shutdown();
}
+if ( contentRepository != null ) {
+contentRepository.shutdown();
+}
+
if ( provenanceEventRepository != null ) {
try {
provenanceEventRepository.close();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
index ba74295..5fbbfd5 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java
@@ -223,6 +223,12 @@ public class FileSystemRepository implements
ContentRepository {
this.contentClaimManager = claimManager;
}
+@Override
+public void shutdown() {
+executor.shutdown();
+containerCleanupExecutor.shutdown();
+}
+
private static double getRatio(final String value) {
final String trimmed = value.trim();
final String percentage = trimmed.substring(0, trimmed.length() - 1);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/55d4b1c0/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
--
diff --git
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
index e14ec5d..99e3655 100644
---
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
+++
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
@@ -137,6 +137,11 @@ public class VolatileContentRepository implements
ContentRepository {
public void initialize(final ContentClaimManager claimManager) {
this.claimManager = claimManager;
}
+
+@Override
+public void shutdown() {
+executor.shutdown();
+}
/**
* Specifies a Backup Repository where data should be written if this
[3/3] incubator-nifi git commit: NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality.
NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d7b1113a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d7b1113a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d7b1113a Branch: refs/heads/nifi-27 Commit: d7b1113a86a8ed52aa2a7f907d89ab8b8a730c73 Parents: a016bf4 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 11:25:25 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 11:25:25 2014 -0500 -- .../ui/src/main/webapp/WEB-INF/jsp/index.jsp| 6 +- .../js/jquery/jqgrid/css/ellipsis-xbl.xml | 29 - .../webapp/js/jquery/jqgrid/css/ui.jqgrid.css | 251 ++--- .../js/jquery/jqgrid/js/i18n/grid.locale-en.js | 175 +++- .../js/jquery/jqgrid/js/jquery.jqGrid.min.js| 959 +++ .../ui/src/main/webapp/js/nf-common.js | 7 +- 6 files changed, 826 insertions(+), 601 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp -- diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp index 8470f61..e39ccc3 100644 --- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp @@ -23,7 +23,7 @@ meta http-equiv=X-UA-Compatible content=IE=EmulateIE7/ link rel=shortcut icon href=images/nifi16.ico/ -link rel=stylesheet href=../nifi/js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css type=text/css / link rel=stylesheet href=../nifi/js/jquery/modal/jquery.modal.css type=text/css / link rel=stylesheet href=js/jquery/jqgrid/css/ui.jqgrid.css type=text/css / @@ -33,8 +33,8 @@ link rel=stylesheet href=css/threshold_styles.css type=text/css / -script type=text/javascript src=../nifi/js/jquery/jquery-1.7.min.js/script -script type=text/javascript src=../nifi/js/jquery/jquery-ui-1.8.10.custom.min.js/script +script type=text/javascript src=../nifi/js/jquery/jquery-2.1.1.min.js/script +script type=text/javascript src=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js/script script type=text/javascript src=../nifi/js/jquery/jquery.center.js/script script type=text/javascript src=../nifi/js/jquery/modal/jquery.modal.js/script http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml -- diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml deleted file mode 100644 index ea0bdf8..000 --- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml +++ /dev/null @@ -1,29 +0,0 @@ -?xml version=1.0? -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- -bindings -xmlns=http://www.mozilla.org/xbl; -xmlns:xbl=http://www.mozilla.org/xbl; -xmlns:xul=http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul; -binding id=ellipsis -content -xul:window!-- xul:window tag required for FF2 -- -xul:description crop=end xbl:inherits=value=xbl:text -children/ -/xul:description -/xul:window -/content -/binding -/bindings
[2/3] incubator-nifi git commit: NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
--
diff --git
a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
old mode 100755
new mode 100644
index 5ce272f..340d0a0
---
a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
+++
b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
@@ -1,416 +1,545 @@
/*
- * jqGrid 3.6.5 - jQuery Grid
- * Copyright (c) 2008, Tony Tomov, t...@trirand.com
- * Dual licensed under the MIT and GPL licenses
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * Date:2010-05-05
- * Modules: grid.base.js; jquery.fmatter.js; grid.custom.js; grid.common.js;
grid.formedit.js; jquery.searchFilter.js; grid.inlinedit.js; grid.celledit.js;
jqModal.js; jqDnR.js; grid.subgrid.js; grid.treegrid.js; grid.import.js;
JsonXml.js; grid.setcolumns.js; grid.postext.js; grid.tbltogrid.js;
grid.jqueryui.js;
- */
-(function(b){b.jgrid = b.jgrid || {}; b.extend(b.jgrid,
{htmlDecode:function(f){if (f == nbsp; || f == #160; || f.length == 1
f.charCodeAt(0) == 160)return; return!f?f:String(f).replace(/amp;/g,
).replace(/gt;/g, ).replace(/lt;/g, ).replace(/quot;/g, '')},
htmlEncode:function(f){return!f?f:String(f).replace(//g,
amp;).replace(//g, gt;).replace(//g, lt;).replace(/\/g, quot;)},
format:function(f){var k = b.makeArray(arguments).slice(1); if (f ===
undefined)f = ; return f.replace(/\{(\d+)\}/g, function(i,
-h){return k[h]})}, getCellIndex:function(f){f = b(f); f = (!f.is(td)
!f.is(th)?f.closest(td,th):f)[0]; if (b.browser.msie)return b.inArray(f,
f.parentNode.cells); return f.cellIndex}, stripHtml:function(f){f += ; var k
= /([^]*|'[^']*'|[^'])*/gi; if (f)return(f = f.replace(k, )) f !==
nbsp; f !== #160;?f.replace(/\/g, '):; else return f},
stringToDoc:function(f){var k; if (typeof f !== string)return f; try{k = (new
DOMParser).parseFromString(f, text/xml)} catch (i){k = new
ActiveXObject(Microsoft.XMLDOM);
-k.async = false; k.loadXML(f)}return k k.documentElement
k.documentElement.tagName != parsererror?k:null}, parse:function(f){f = f; if
(f.substr(0, 9) == while(1);)f = f.substr(9); if (f.substr(0, 2) == /*)f =
f.substr(2, f.length - 4); f || (f = {}); return b.jgrid.useJSON === true
typeof JSON === object typeof JSON.parse ===
function?JSON.parse(f):eval(( + f + ))}, jqID:function(f){f += ; return
f.replace(/([\.\:\[\]])/g, \\$1)}, ajaxOptions:{},
extend:function(f){b.extend(b.fn.jqGrid, f); this.no_legacy_api ||
b.fn.extend(f)}});
-b.fn.jqGrid = function(f){if (typeof f == string){var k =
b.fn.jqGrid[f]; if (!k)throwjqGrid - No such method: + f; var i =
b.makeArray(arguments).slice(1); return k.apply(this, i)}return
this.each(function(){if (!this.grid){var h = b.extend(true, {url:,
height:150, page:1, rowNum:20, records:0, pager:, pgbuttons:true,
pginput:true, colModel:[], rowList:[], colNames:[], sortorder:asc,
sortname:, datatype:xml, mtype:GET, altRows:false, selarrrow:[],
savedRow:[], shrinkToFit:true, xmlReader:{}, jsonReader:{}, subGrid:false,
-subGridModel:[], reccount:0, lastpage:0, lastsort:0,
selrow:null, beforeSelectRow:null, onSelectRow:null, onSortCol:null,
ondblClickRow:null, onRightClickRow:null, onPaging:null, onSelectAll:null,
loadComplete:null, gridComplete:null, loadError:null, loadBeforeSend:null,
afterInsertRow:null, beforeRequest:null, onHeaderClick:null, viewrecords:false,
loadonce:false, multiselect:false, multikey:false, editurl:null, search:false,
caption:, hidegrid:true, hiddengrid:false, postData:{}, userData:{},
treeGrid:false, treeGridModel:nested,
-treeReader:{}, treeANode: - 1, ExpandColumn:null,
tree_root_level:0, prmNames:{page:page, rows:rows, sort:sidx,
order:sord, search:_search, nd:nd, id:id, oper:oper, editoper:edit,
addoper:add, deloper:del, subgridid:id, npage:null}, forceFit:false,
gridstate:visible, cellEdit:false, cellsubmit:remote, nv:0,
loadui:enable, toolbar:[false, ], scroll:false, multiboxonly:false,
deselectAfterSort:true, scrollrows:false, autowidth:false, scrollOffset:18,
cellLayout:5, subGridWidth:20, multiselectWidth:20,
-gridview:false, rownumWidth:25, rownumbers:false,
pagerpos:center, recordpos:right, footerrow:false, userDataOnFooter:false,
hoverrows:true, altclass:ui-priority-secondary, viewsortcols:[false,
vertical, true], resizeclass:, autoencode:false, remapColumns:[],
ajaxGridOptions:{}, direction:ltr, toppager:false, headertitles:false,
scrollTimeout:200}, b.jgrid.defaults, f || {}), g = {headers:[], cols:[],
[jira] [Commented] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248444#comment-14248444 ] ASF subversion and git services commented on NIFI-27: - Commit d7b1113a86a8ed52aa2a7f907d89ab8b8a730c73 in incubator-nifi's branch refs/heads/nifi-27 from [~mcgilman] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=d7b1113 ] NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality. Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
incubator-nifi git commit: NIFI-173 fixed web war finding
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-169 8fb78d2a5 - d9dab0061
NIFI-173 fixed web war finding
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d9dab006
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d9dab006
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d9dab006
Branch: refs/heads/NIFI-169
Commit: d9dab00612521ba5dd49d8b78c6593b082834c3f
Parents: 8fb78d2
Author: joewitt joew...@apache.org
Authored: Tue Dec 16 11:46:37 2014 -0500
Committer: joewitt joew...@apache.org
Committed: Tue Dec 16 11:46:37 2014 -0500
--
.../src/main/java/org/apache/nifi/web/server/JettyServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d9dab006/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index 9ed29ff..3900cfc 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++
b/nar-bundles/framework-bundle/framework/web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -273,7 +273,7 @@ public class JettyServer implements NiFiServer {
// consider each nar working directory
for (final File narWorkingDirectory : narWorkingDirectories) {
-final File narDependencies = new File(narWorkingDirectory,
META-INF/dependencies);
+final File narDependencies = new File(narWorkingDirectory,
META-INF/bundled-dependencies);
if (narDependencies.isDirectory()) {
// list the wars from this nar
final File[] narDependencyDirs =
narDependencies.listFiles(WAR_FILTER);
[jira] [Commented] (NIFI-173) nar maven plugin needs to create a directory with a more unique name than depdencies
[ https://issues.apache.org/jira/browse/NIFI-173?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248469#comment-14248469 ] ASF subversion and git services commented on NIFI-173: -- Commit d9dab00612521ba5dd49d8b78c6593b082834c3f in incubator-nifi's branch refs/heads/NIFI-169 from [~joewitt] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=d9dab00 ] NIFI-173 fixed web war finding nar maven plugin needs to create a directory with a more unique name than depdencies Key: NIFI-173 URL: https://issues.apache.org/jira/browse/NIFI-173 Project: Apache NiFi Issue Type: Sub-task Components: Tools Reporter: Joseph Witt Assignee: Joseph Witt Fix For: 0.0.1 the nar maven plugin seems to be creating build issues on some platforms since it makes a directory called 'dependencies' in the nar and the apache stuff is causing there to be also be a 'DEPENDENCIES' dir. So needing a more unique name. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[22/50] [abbrv] incubator-nifi git commit: Merge branch 'nifi-27' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into nifi-27
Merge branch 'nifi-27' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into nifi-27 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5b0d8a5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5b0d8a5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5b0d8a5d Branch: refs/heads/develop Commit: 5b0d8a5dc1f7a69d92f42e7d99fe4a84c290845f Parents: 1d23e6e 2f2474e Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 14:42:01 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 14:42:01 2014 -0500 -- --
[27/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
index de94dbf..3ecf3d2 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
@@ -8,7 +8,8 @@ classes should alter those!
.slick-header.ui-state-default, .slick-headerrow.ui-state-default {
width: 100%;
overflow: hidden;
- border-left: 0px;
+ /*border-left: 0px;*/
+ border: 0px;
}
.slick-header-columns, .slick-headerrow-columns {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
new file mode 100755
index 000..d441f75
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
new file mode 100755
index 000..b1776f8
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
new file mode 100755
index 000..79969e6
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100755
index 000..1e35525
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
new file mode 100755
index 000..103f966
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
differ
[39/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
deleted file mode 100755
index ecac757..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
+++ /dev/null
@@ -1,15008 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-12-08
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-(function( $, undefined ) {
-
-var uuid = 0,
- runiqueId = /^ui-id-\d+$/;
-
-// $.ui might exist from components with no dependencies, e.g., $.ui.position
-$.ui = $.ui || {};
-
-$.extend( $.ui, {
- version: 1.10.4,
-
- keyCode: {
- BACKSPACE: 8,
- COMMA: 188,
- DELETE: 46,
- DOWN: 40,
- END: 35,
- ENTER: 13,
- ESCAPE: 27,
- HOME: 36,
- LEFT: 37,
- NUMPAD_ADD: 107,
- NUMPAD_DECIMAL: 110,
- NUMPAD_DIVIDE: 111,
- NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106,
- NUMPAD_SUBTRACT: 109,
- PAGE_DOWN: 34,
- PAGE_UP: 33,
- PERIOD: 190,
- RIGHT: 39,
- SPACE: 32,
- TAB: 9,
- UP: 38
- }
-});
-
-// plugins
-$.fn.extend({
- focus: (function( orig ) {
- return function( delay, fn ) {
- return typeof delay === number ?
- this.each(function() {
- var elem = this;
- setTimeout(function() {
- $( elem ).focus();
- if ( fn ) {
- fn.call( elem );
- }
- }, delay );
- }) :
- orig.apply( this, arguments );
- };
- })( $.fn.focus ),
-
- scrollParent: function() {
- var scrollParent;
- if (($.ui.ie
(/(static|relative)/).test(this.css(position))) ||
(/absolute/).test(this.css(position))) {
- scrollParent = this.parents().filter(function() {
- return
(/(relative|absolute|fixed)/).test($.css(this,position))
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
- }).eq(0);
- } else {
- scrollParent = this.parents().filter(function() {
- return
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
- }).eq(0);
- }
-
- return (/fixed/).test(this.css(position)) ||
!scrollParent.length ? $(document) : scrollParent;
- },
-
- zIndex: function( zIndex ) {
- if ( zIndex !== undefined ) {
- return this.css( zIndex, zIndex );
- }
-
- if ( this.length ) {
- var elem = $( this[ 0 ] ), position, value;
- while ( elem.length elem[ 0 ] !== document ) {
- // Ignore z-index if position is set to a value
where z-index is ignored by the browser
- // This makes behavior of this function
consistent across browsers
- // WebKit always returns auto if the element is
positioned
-
[11/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
index 2d8a482..04b20d2 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
@@ -5,508 +5,508 @@
*/
(function ($) {
-// register namespace
-$.extend(true, window, {
-Slick: {
-Editors: {
-Text: TextEditor,
-Integer: IntegerEditor,
-Date: DateEditor,
-YesNoSelect: YesNoSelectEditor,
-Checkbox: CheckboxEditor,
-PercentComplete: PercentCompleteEditor,
-LongText: LongTextEditor
-}
-}
-});
-
-function TextEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-
-this.init = function () {
-$input = $(INPUT type=text class='editor-text' /)
-.appendTo(args.container)
-.bind(keydown.nav, function (e) {
-if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode ===
$.ui.keyCode.RIGHT) {
-e.stopImmediatePropagation();
-}
-})
-.focus()
-.select();
-};
-
-this.destroy = function () {
-$input.remove();
-};
-
-this.focus = function () {
-$input.focus();
-};
-
-this.getValue = function () {
-return $input.val();
-};
-
-this.setValue = function (val) {
-$input.val(val);
-};
-
-this.loadValue = function (item) {
-defaultValue = item[args.column.field] || ;
-$input.val(defaultValue);
-$input[0].defaultValue = defaultValue;
-$input.select();
-};
-
-this.serializeValue = function () {
-return $input.val();
-};
-
-this.applyValue = function (item, state) {
-item[args.column.field] = state;
-};
-
-this.isValueChanged = function () {
-return (!($input.val() == defaultValue == null))
($input.val() != defaultValue);
-};
-
-this.validate = function () {
-if (args.column.validator) {
-var validationResults = args.column.validator($input.val());
-if (!validationResults.valid) {
-return validationResults;
-}
-}
-
-return {
-valid: true,
-msg: null
-};
-};
-
-this.init();
-}
-
-function IntegerEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-
-this.init = function () {
-$input = $(INPUT type=text class='editor-text' /);
-
-$input.bind(keydown.nav, function (e) {
-if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode ===
$.ui.keyCode.RIGHT) {
-e.stopImmediatePropagation();
-}
-});
-
-$input.appendTo(args.container);
-$input.focus().select();
-};
-
-this.destroy = function () {
-$input.remove();
-};
-
-this.focus = function () {
-$input.focus();
-};
-
-this.loadValue = function (item) {
-defaultValue = item[args.column.field];
-$input.val(defaultValue);
-$input[0].defaultValue = defaultValue;
-$input.select();
-};
-
-this.serializeValue = function () {
-return parseInt($input.val(), 10) || 0;
-};
-
-this.applyValue = function (item, state) {
-item[args.column.field] = state;
-};
-
-this.isValueChanged = function () {
-return (!($input.val() == defaultValue == null))
($input.val() != defaultValue);
-};
-
-this.validate = function () {
-if (isNaN($input.val())) {
-return {
-valid: false,
-msg: Please enter a valid integer
-};
-}
-
-return {
-valid: true,
-msg: null
-};
-};
-
-this.init();
-}
-
-function DateEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-var
[44/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' into nifi-27
Merge branch 'develop' into nifi-27 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f10bb3cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f10bb3cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f10bb3cc Branch: refs/heads/develop Commit: f10bb3ccade86247b44fe3a1905af94754ab54eb Parents: 888d1ba 1cc3ce5 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 09:44:24 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 09:44:24 2014 -0500 -- .gitignore | 1 + .../nifi/src/main/assembly/dependencies.xml | 12 + misc/build-order.sh | 4 +- misc/nar-maven-plugin/pom.xml | 21 +- .../src/main/java/nifi/NarMojo.java | 4 +- .../nifi/controller/FileSystemSwapManager.java | 33 ++- .../apache/nifi/controller/FlowController.java | 24 +- .../repository/FileSystemRepository.java| 6 + .../repository/StandardProcessSession.java | 134 - .../repository/StandardProvenanceReporter.java | 4 +- .../repository/VolatileContentRepository.java | 5 + .../nifi/remote/StandardRemoteProcessGroup.java | 100 +++ .../org/apache/nifi/util/ReflectionUtils.java | 72 ++--- .../repository/TestStandardProcessSession.java | 283 +++ .../src/main/resources/bin/nifi-status.bat | 8 +- .../resources/src/main/resources/bin/nifi.sh| 4 +- .../src/main/resources/bin/run-nifi.bat | 6 +- .../src/main/resources/bin/start-nifi.bat | 7 +- .../src/main/resources/bin/stop-nifi.bat| 8 +- .../web/nifi-web-api/nb-configuration.xml | 18 -- .../nifi/processors/standard/EvaluateXPath.java | 31 +- .../processors/standard/TestScanContent.java| 2 +- .../VolatileProvenanceRepository.java | 2 + .../nifi/components/PropertyDescriptor.java | 2 +- .../repository/ContentRepository.java | 6 + .../repository/FlowFileSwapManager.java | 5 +- .../nifi/components/TestPropertyDescriptor.java | 59 27 files changed, 651 insertions(+), 210 deletions(-) --
[37/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
index 443..ddc501a 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
@@ -336,6 +336,7 @@ nf.GoTo = (function () {
}
});
},
+
/**
* Shows components downstream from a processor.
*
@@ -348,7 +349,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -372,8 +373,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components upstream from a processor.
*
@@ -386,7 +388,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the upstream dialog
@@ -410,8 +412,9 @@ nf.GoTo = (function () {
// show the upstream dialog
$('#connections-dialog').modal('setHeaderText', 'Upstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components downstream from a process group or a remote
process group.
*
@@ -424,7 +427,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -448,8 +451,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components upstream from a process group or a remote process
group.
*
@@ -462,7 +466,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the upstream dialog
@@ -486,8 +490,9 @@ nf.GoTo = (function () {
// show the dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components downstream from an input port.
*
@@ -500,7 +505,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -524,8 +529,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-},
[04/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
old mode 100755
new mode 100644
index 4de1393..e2d4ec2
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
@@ -1,67 +1,97 @@
/* BASICS */
.CodeMirror {
-/* Set height, width, borders, and global font properties here */
-font-family: monospace;
-height: 300px;
+ /* Set height, width, borders, and global font properties here */
+ font-family: monospace;
+ height: 300px;
}
.CodeMirror-scroll {
-/* Set scrolling behaviour here */
-overflow: auto;
+ /* Set scrolling behaviour here */
+ overflow: auto;
}
/* PADDING */
.CodeMirror-lines {
-padding: 4px 0; /* Vertical padding around content */
+ padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
-padding: 0 4px; /* Horizontal padding of content */
+ padding: 0 4px; /* Horizontal padding of content */
}
.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-background-color: white; /* The little square between H and V scrollbars */
+ background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */
.CodeMirror-gutters {
-border-right: 1px solid #ddd;
-background-color: #f7f7f7;
-white-space: nowrap;
+ border-right: 1px solid #ddd;
+ background-color: #f7f7f7;
+ white-space: nowrap;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
-padding: 0 3px 0 5px;
-min-width: 20px;
-text-align: right;
-color: #999;
--moz-box-sizing: content-box;
-box-sizing: content-box;
+ padding: 0 3px 0 5px;
+ min-width: 20px;
+ text-align: right;
+ color: #999;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
}
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
/* CURSOR */
.CodeMirror div.CodeMirror-cursor {
-border-left: 1px solid black;
+ border-left: 1px solid black;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
-border-left: 1px solid silver;
+ border-left: 1px solid silver;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+ width: auto;
+ border: 0;
+ background: #7e7;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+ z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+ width: auto;
+ border: 0;
+ -webkit-animation: blink 1.06s steps(1) infinite;
+ -moz-animation: blink 1.06s steps(1) infinite;
+ animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
-width: auto;
-border: 0;
-background: #7e7;
+@keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
+
/* Can style cursor different in overwrite (non-insert) mode */
div.CodeMirror-overwrite div.CodeMirror-cursor {}
-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }
.CodeMirror-ruler {
-border-left: 1px solid #ccc;
-position: absolute;
+ border-left: 1px solid #ccc;
+ position: absolute;
}
/* DEFAULT THEME */
@@ -70,11 +100,12 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
@@ -94,12 +125,16 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
.cm-s-default .cm-error {color: #f00;}
.cm-invalidchar {color: #f00;}
+/* Default styles for common addons */
+
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror
[50/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality.
NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d7b1113a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d7b1113a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d7b1113a Branch: refs/heads/develop Commit: d7b1113a86a8ed52aa2a7f907d89ab8b8a730c73 Parents: a016bf4 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 11:25:25 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 11:25:25 2014 -0500 -- .../ui/src/main/webapp/WEB-INF/jsp/index.jsp| 6 +- .../js/jquery/jqgrid/css/ellipsis-xbl.xml | 29 - .../webapp/js/jquery/jqgrid/css/ui.jqgrid.css | 251 ++--- .../js/jquery/jqgrid/js/i18n/grid.locale-en.js | 175 +++- .../js/jquery/jqgrid/js/jquery.jqGrid.min.js| 959 +++ .../ui/src/main/webapp/js/nf-common.js | 7 +- 6 files changed, 826 insertions(+), 601 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp -- diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp index 8470f61..e39ccc3 100644 --- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/WEB-INF/jsp/index.jsp @@ -23,7 +23,7 @@ meta http-equiv=X-UA-Compatible content=IE=EmulateIE7/ link rel=shortcut icon href=images/nifi16.ico/ -link rel=stylesheet href=../nifi/js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css type=text/css / link rel=stylesheet href=../nifi/js/jquery/modal/jquery.modal.css type=text/css / link rel=stylesheet href=js/jquery/jqgrid/css/ui.jqgrid.css type=text/css / @@ -33,8 +33,8 @@ link rel=stylesheet href=css/threshold_styles.css type=text/css / -script type=text/javascript src=../nifi/js/jquery/jquery-1.7.min.js/script -script type=text/javascript src=../nifi/js/jquery/jquery-ui-1.8.10.custom.min.js/script +script type=text/javascript src=../nifi/js/jquery/jquery-2.1.1.min.js/script +script type=text/javascript src=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js/script script type=text/javascript src=../nifi/js/jquery/jquery.center.js/script script type=text/javascript src=../nifi/js/jquery/modal/jquery.modal.js/script http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml -- diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml deleted file mode 100644 index ea0bdf8..000 --- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/css/ellipsis-xbl.xml +++ /dev/null @@ -1,29 +0,0 @@ -?xml version=1.0? -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- -bindings -xmlns=http://www.mozilla.org/xbl; -xmlns:xbl=http://www.mozilla.org/xbl; -xmlns:xul=http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul; -binding id=ellipsis -content -xul:window!-- xul:window tag required for FF2 -- -xul:description crop=end xbl:inherits=value=xbl:text -children/ -/xul:description -/xul:window -/content -/binding -/bindings
[jira] [Commented] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248543#comment-14248543 ] ASF subversion and git services commented on NIFI-27: - Commit d7b1113a86a8ed52aa2a7f907d89ab8b8a730c73 in incubator-nifi's branch refs/heads/develop from [~mcgilman] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=d7b1113 ] NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality. Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[06/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
NIFI-27: - Latest version of codemirror. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9180b7d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9180b7d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9180b7d4 Branch: refs/heads/develop Commit: 9180b7d4a1c05200cddeb946da120643c627037a Parents: b61a1de Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 12:56:04 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 12:56:04 2014 -0500 -- .../src/main/webapp/WEB-INF/pages/canvas.jsp|4 +- .../src/main/webapp/js/codemirror/LICENSE | 38 +- .../js/codemirror/addon/edit/matchbrackets.js | 125 - .../js/codemirror/addon/hint/show-hint.css | 54 +- .../js/codemirror/addon/hint/show-hint.js | 411 - .../js/codemirror/lib/codemirror-compressed.js | 16 + .../webapp/js/codemirror/lib/codemirror.css | 282 +- .../main/webapp/js/codemirror/lib/codemirror.js | 8488 -- 8 files changed, 228 insertions(+), 9190 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index 09c8207..a40b745 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -33,9 +33,7 @@ link rel=stylesheet href=js/jquery/minicolors/jquery.minicolors.css type=text/css / link rel=stylesheet href=js/jquery/slickgrid/css/slick.grid.css type=text/css / link rel=stylesheet href=js/jquery/slickgrid/css/slick-default-theme.css type=text/css / -script type=text/javascript src=js/codemirror/lib/codemirror.js/script -script type=text/javascript src=js/codemirror/addon/edit/matchbrackets.js/script -script type=text/javascript src=js/codemirror/addon/hint/show-hint.js/script +script type=text/javascript src=js/codemirror/lib/codemirror-compressed.js/script script type=text/javascript src=js/jquery/jquery-1.7.min.js/script script type=text/javascript src=js/jquery/jquery-ui-1.8.10.custom.min.js/script script type=text/javascript src=js/jquery/jquery.center.js/script http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE old mode 100755 new mode 100644 index 4f1e9d1..d21bbea --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE @@ -1,19 +1,19 @@ -Copyright (C) 2013 by Marijn Haverbeke mari...@gmail.com and others - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the Software), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright (C) 2014 by Marijn Haverbeke mari...@gmail.com and others + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use,
[02/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of qtip2.
NIFI-27:
- Latest version of qtip2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/57b4178f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/57b4178f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/57b4178f
Branch: refs/heads/develop
Commit: 57b4178f19960bb4359d79f462c6e790e3e8f1a1
Parents: f60a97b
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Wed Dec 10 08:35:31 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Wed Dec 10 12:19:26 2014 -0500
--
.../webapp/WEB-INF/pages/bulletin-board.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/cluster.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/history.jsp | 2 +-
.../main/webapp/WEB-INF/pages/provenance.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/users.jsp | 2 +-
.../main/webapp/js/jquery/qtip2/jquery.qtip.css | 557 ---
.../webapp/js/jquery/qtip2/jquery.qtip.min.css | 3 +
.../webapp/js/jquery/qtip2/jquery.qtip.min.js | 711 +--
12 files changed, 17 insertions(+), 1272 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
index 8669f6c..083862d 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
@@ -24,7 +24,7 @@
${nf.bulletin.board.style.tags}
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
script type=text/javascript
src=js/jquery/jquery-1.7.min.js/script
script type=text/javascript
src=js/jquery/jquery.center.js/script
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index acdd147..c8f2ff7 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -28,7 +28,7 @@
link rel=stylesheet
href=js/jquery/tabbs/jquery.tabbs.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
link rel=stylesheet
href=js/jquery/minicolors/jquery.minicolors.css type=text/css /
link rel=stylesheet href=js/jquery/slickgrid/css/slick.grid.css
type=text/css /
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index 33fdbb0..e3e7b86 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++
[40/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
index d06749e..938d85e 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
@@ -1,420 +1,11 @@
/*
* jQuery MiniColors: A tiny color picker built on jQuery
*
- * Copyright Cory LaViska for A Beautiful Site, LLC.
(http://www.abeautifulsite.net/)
+ * Copyright: Cory LaViska for A Beautiful Site, LLC
*
- * Licensed under the MIT license: http://opensource.org/licenses/MIT
+ * Contributions and bug reports: https://github.com/claviska/jquery-minicolors
*
- */jQuery function (e) {
-function t(t, n) {
-var r = e('div class=minicolors /'), i = e.minicolors.defaults;
-if (t.data(minicolors-initialized))
-return;
-n = e.extend(!0, {}, i, n);
-r.addClass(minicolors-theme- +
n.theme).toggleClass(minicolors-with-opacity, n.opacity);
-n.position !== undefined e.each(n.position.split( ), function () {
-r.addClass(minicolors-position- + this)
-});
-t.addClass(minicolors-input).data(minicolors-initialized,
!1).data(minicolors-settings, n).prop(size, 7).wrap(r).after('div
class=minicolors-panel minicolors-slider-' + n.control + '' + 'div
class=minicolors-slider' + 'div class=minicolors-picker/div' +
/div + 'div class=minicolors-opacity-slider' + 'div
class=minicolors-picker/div' + /div + 'div class=minicolors-grid'
+ 'div class=minicolors-grid-inner/div' + 'div
class=minicolors-pickerdiv/div/div' + /div + /div);
-if (!n.inline) {
-t.after('span class=minicolors-swatchspan
class=minicolors-swatch-color/span/span');
-t.next(.minicolors-swatch).on(click, function (e) {
-e.preventDefault();
-t.focus()
-})
-}
-t.parent().find(.minicolors-panel).on(selectstart, function () {
-return!1
-}).end();
-n.inline t.parent().addClass(minicolors-inline);
-u(t, !1);
-t.data(minicolors-initialized, !0)
-}
-function n(e) {
-var t = e.parent();
-
e.removeData(minicolors-initialized).removeData(minicolors-settings).removeProp(size).removeClass(minicolors-input);
-t.before(e).remove()
-}
-function r(e) {
-var t = e.parent(), n = t.find(.minicolors-panel), r =
e.data(minicolors-settings);
-if (!e.data(minicolors-initialized) || e.prop(disabled) ||
t.hasClass(minicolors-inline) || t.hasClass(minicolors-focus))
-return;
-i();
-t.addClass(minicolors-focus);
-n.stop(!0, !0).fadeIn(r.showSpeed, function () {
-r.show r.show.call(e.get(0))
-})
-}
-function i() {
-e(.minicolors-focus).each(function () {
-var t = e(this), n = t.find(.minicolors-input), r =
t.find(.minicolors-panel), i = n.data(minicolors-settings);
-r.fadeOut(i.hideSpeed, function () {
-i.hide i.hide.call(n.get(0));
-t.removeClass(minicolors-focus)
-})
-})
-}
-function s(e, t, n) {
-var r = e.parents(.minicolors).find(.minicolors-input), i =
r.data(minicolors-settings), s = e.find([class$=-picker]), u =
e.offset().left, a = e.offset().top, f = Math.round(t.pageX - u), l =
Math.round(t.pageY - a), c = n ? i.animationSpeed : 0, h, p, d, v;
-if (t.originalEvent.changedTouches) {
-f = t.originalEvent.changedTouches[0].pageX - u;
-l = t.originalEvent.changedTouches[0].pageY - a
-}
-f 0 (f = 0);
-l 0 (l = 0);
-f e.width() (f = e.width());
-l e.height() (l = e.height());
-if (e.parent().is(.minicolors-slider-wheel)
s.parent().is(.minicolors-grid)) {
-h = 75 - f;
-p = 75 - l;
-d = Math.sqrt(h * h + p * p);
-v = Math.atan2(p, h);
-v 0 (v += Math.PI * 2);
-if (d 75) {
-d = 75;
-f = 75 - 75 * Math.cos(v);
-l = 75 - 75 * Math.sin(v)
-}
-f = Math.round(f);
-l = Math.round(l)
-}
-e.is(.minicolors-grid) ? s.stop(!0).animate({top: l + px, left: f
+ px}, c, i.animationEasing, function () {
-o(r, e)
-}) : s.stop(!0).animate({top: l + px}, c, i.animationEasing,
[12/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
index 07f5900..f1c1b5e 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
@@ -1,914 +1,1126 @@
(function ($) {
-$.extend(true, window, {
-Slick: {
-Data: {
-DataView: DataView,
-Aggregators: {
-Avg: AvgAggregator,
-Min: MinAggregator,
-Max: MaxAggregator,
-Sum: SumAggregator
-}
-}
+ $.extend(true, window, {
+Slick: {
+ Data: {
+DataView: DataView,
+Aggregators: {
+ Avg: AvgAggregator,
+ Min: MinAggregator,
+ Max: MaxAggregator,
+ Sum: SumAggregator
}
-});
-
+ }
+}
+ });
+
+
+ /***
+ * A sample Model implementation.
+ * Provides a filtered view of the underlying data.
+ *
+ * Relies on the data item having an id property uniquely identifying it.
+ */
+ function DataView(options) {
+var self = this;
+
+var defaults = {
+ groupItemMetadataProvider: null,
+ inlineFilters: false
+};
+
+
+// private
+var idProperty = id; // property holding a unique row id
+var items = []; // data by index
+var rows = []; // data by row
+var idxById = {}; // indexes by id
+var rowsById = null;// rows by id; lazy-calculated
+var filter = null; // filter function
+var updated = null; // updated item ids
+var suspend = false;// suspends the recalculation
+var sortAsc = true;
+var fastSortField;
+var sortComparer;
+var refreshHints = {};
+var prevRefreshHints = {};
+var filterArgs;
+var filteredItems = [];
+var compiledFilter;
+var compiledFilterWithCaching;
+var filterCache = [];
+
+// grouping
+var groupingInfoDefaults = {
+ getter: null,
+ formatter: null,
+ comparer: function(a, b) { return a.value - b.value; },
+ predefinedValues: [],
+ aggregators: [],
+ aggregateEmpty: false,
+ aggregateCollapsed: false,
+ aggregateChildGroups: false,
+ collapsed: false,
+ displayTotalsRow: true,
+ lazyTotalsCalculation: false
+};
+var groupingInfos = [];
+var groups = [];
+var toggledGroupsByLevel = [];
+var groupingDelimiter = ':|:';
+
+var pagesize = 0;
+var pagenum = 0;
+var totalRows = 0;
+
+// events
+var onRowCountChanged = new Slick.Event();
+var onRowsChanged = new Slick.Event();
+var onPagingInfoChanged = new Slick.Event();
+
+options = $.extend(true, {}, defaults, options);
+
+
+function beginUpdate() {
+ suspend = true;
+}
+
+function endUpdate() {
+ suspend = false;
+ refresh();
+}
+
+function setRefreshHints(hints) {
+ refreshHints = hints;
+}
+
+function setFilterArgs(args) {
+ filterArgs = args;
+}
+
+function updateIdxById(startingIndex) {
+ startingIndex = startingIndex || 0;
+ var id;
+ for (var i = startingIndex, l = items.length; i l; i++) {
+id = items[i][idProperty];
+if (id === undefined) {
+ throw Each data element must implement a unique 'id' property;
+}
+idxById[id] = i;
+ }
+}
+
+function ensureIdUniqueness() {
+ var id;
+ for (var i = 0, l = items.length; i l; i++) {
+id = items[i][idProperty];
+if (id === undefined || idxById[id] !== i) {
+ throw Each data element must implement a unique 'id' property;
+}
+ }
+}
+
+function getItems() {
+ return items;
+}
+
+function setItems(data, objectIdProperty) {
+ if (objectIdProperty !== undefined) {
+idProperty = objectIdProperty;
+ }
+ items = filteredItems = data;
+ idxById = {};
+ updateIdxById();
+ ensureIdUniqueness();
+ refresh();
+}
+
+function setPagingOptions(args) {
+ if (args.pageSize != undefined) {
+pagesize = args.pageSize;
+pagenum = pagesize ? Math.min(pagenum, Math.max(0, Math.ceil(totalRows
/ pagesize) - 1)) : 0;
+ }
+
+ if (args.pageNum != undefined) {
+pagenum = Math.min(args.pageNum, Math.max(0, Math.ceil(totalRows /
pagesize) - 1));
+ }
+
+ onPagingInfoChanged.notify(getPagingInfo(),
[13/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
index aea3567..2f097b1 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
@@ -5,419 +5,463 @@
*/
(function ($) {
-// register namespace
-$.extend(true, window, {
-Slick: {
-Event: Event,
-EventData: EventData,
-EventHandler: EventHandler,
-Range: Range,
-NonDataRow: NonDataItem,
-Group: Group,
-GroupTotals: GroupTotals,
-EditorLock: EditorLock,
-/***
- * A global singleton editor lock.
- * @class GlobalEditorLock
- * @static
- * @constructor
- */
-GlobalEditorLock: new EditorLock()
-}
-});
+ // register namespace
+ $.extend(true, window, {
+Slick: {
+ Event: Event,
+ EventData: EventData,
+ EventHandler: EventHandler,
+ Range: Range,
+ NonDataRow: NonDataItem,
+ Group: Group,
+ GroupTotals: GroupTotals,
+ EditorLock: EditorLock,
+
+ /***
+ * A global singleton editor lock.
+ * @class GlobalEditorLock
+ * @static
+ * @constructor
+ */
+ GlobalEditorLock: new EditorLock()
+}
+ });
+
+ /***
+ * An event object for passing data to event handlers and letting them
control propagation.
+ * pThis is pretty much identical to how W3C and jQuery implement
events./p
+ * @class EventData
+ * @constructor
+ */
+ function EventData() {
+var isPropagationStopped = false;
+var isImmediatePropagationStopped = false;
/***
- * An event object for passing data to event handlers and letting them
control propagation.
- * pThis is pretty much identical to how W3C and jQuery implement
events./p
- * @class EventData
- * @constructor
+ * Stops event from propagating up the DOM tree.
+ * @method stopPropagation
*/
-function EventData() {
-var isPropagationStopped = false;
-var isImmediatePropagationStopped = false;
-
-/***
- * Stops event from propagating up the DOM tree.
- * @method stopPropagation
- */
-this.stopPropagation = function () {
-isPropagationStopped = true;
-};
-
-/***
- * Returns whether stopPropagation was called on this event object.
- * @method isPropagationStopped
- * @return {Boolean}
- */
-this.isPropagationStopped = function () {
-return isPropagationStopped;
-};
-
-/***
- * Prevents the rest of the handlers from being executed.
- * @method stopImmediatePropagation
- */
-this.stopImmediatePropagation = function () {
-isImmediatePropagationStopped = true;
-};
-
-/***
- * Returns whether stopImmediatePropagation was called on this event
object.\
- * @method isImmediatePropagationStopped
- * @return {Boolean}
- */
-this.isImmediatePropagationStopped = function () {
-return isImmediatePropagationStopped;
-}
-}
+this.stopPropagation = function () {
+ isPropagationStopped = true;
+};
/***
- * A simple publisher-subscriber implementation.
- * @class Event
- * @constructor
+ * Returns whether stopPropagation was called on this event object.
+ * @method isPropagationStopped
+ * @return {Boolean}
*/
-function Event() {
-var handlers = [];
-
-/***
- * Adds an event handler to be called when the event is fired.
- * pEvent handler will receive two arguments - an
codeEventData/code and the codedata/code
- * object the event was fired with.p
- * @method subscribe
- * @param fn {Function} Event handler.
- */
-this.subscribe = function (fn) {
-handlers.push(fn);
-};
-
-/***
- * Removes an event handler added with codesubscribe(fn)/code.
- * @method unsubscribe
- * @param fn {Function} Event handler to be removed.
- */
-this.unsubscribe = function (fn) {
-for (var i = handlers.length - 1; i = 0; i--) {
-if (handlers[i] === fn) {
-handlers.splice(i, 1);
-}
-}
-};
-
-/***
-
[47/50] [abbrv] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a016bf47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a016bf47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a016bf47 Branch: refs/heads/develop Commit: a016bf47bdb778fd436544bd445c1c031aeefb7b Parents: f10bb3c Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 11:12:15 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 11:12:15 2014 -0500 -- .../js/jquery/minicolors/jquery.minicolors.css | 284 +-- .../jquery/minicolors/jquery.minicolors.min.js | 8 +- 2 files changed, 140 insertions(+), 152 deletions(-) --
[35/50] [abbrv] incubator-nifi git commit: NIFI-27: - Updating access control configuration for secure ports due to autocomplete upgrade.
NIFI-27:
- Updating access control configuration for secure ports due to autocomplete
upgrade.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fc78752e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fc78752e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fc78752e
Branch: refs/heads/develop
Commit: fc78752e61fcf82b8a39dbb12bd4a3ff4ce21cb6
Parents: d307a13
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Mon Dec 15 12:02:15 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Mon Dec 15 12:02:15 2014 -0500
--
.../canvas/secure-port-configuration.jsp| 3 +-
.../src/main/webapp/css/port-configuration.css | 16 +--
.../nf/canvas/nf-secure-port-configuration.js | 30 +---
3 files changed, 29 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
index 200ef72..bd87018 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
@@ -78,4 +78,5 @@
/div
/div
/div
-/div
\ No newline at end of file
+/div
+div id=search-users-results/div
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
index 340c2a4..b8fc87c 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
@@ -110,14 +110,26 @@ input.search-users {
color: #888;
}
+#search-users-results .ui-autocomplete {
+max-height: 300px;
+overflow: auto;
+border: 1px solid #aa;
+z-index: 1351;
+border-radius: 0;
+}
+
+#search-users-results .ui-menu .ui-menu-item a.ui-state-focus {
+background: #D4E0E5 !important;
+border: 1px solid #99;
+border-radius: 0;
+}
+
li.search-users-header {
font-weight: bold;
padding-top: 4px;
padding-left: 4px;
padding-right: 4px;
height: 14px;
-float: left;
-clear: left;
}
div.search-users-match-header {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
index 8fe..b21b1bf 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
@@ -138,17 +138,10 @@ nf.SecurePortConfiguration = (function () {
// initialize the access control auto complete
$.widget('nf.userSearchAutocomplete', $.ui.autocomplete, {
-_response: function (content) {
-if (!this.options.disabled content) {
-this._suggest(content);
-this._trigger('open');
-} else {
-this.close();
-}
-this.pending--;
-if (!this.pending) {
-this.element.removeClass('ui-autocomplete-loading');
-}
+_normalize: function(searchResults) {
+var items = [];
+items.push(searchResults);
+return items;
},
_resizeMenu: function () {
var ul =
[jira] [Commented] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248542#comment-14248542 ] ASF subversion and git services commented on NIFI-27: - Commit a016bf47bdb778fd436544bd445c1c031aeefb7b in incubator-nifi's branch refs/heads/develop from [~mcgilman] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=a016bf4 ] NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version. Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[17/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of D3.
NIFI-27: - Latest version of D3. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8a0e2cee Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8a0e2cee Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8a0e2cee Branch: refs/heads/develop Commit: 8a0e2cee4a2ccdf0f253922a3f900409821e4776 Parents: 4c959f7 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 11:26:27 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 14:36:35 2014 -0500 -- .../nifi-web-ui/src/main/webapp/js/d3/LICENSE | 52 +- .../nifi-web-ui/src/main/webapp/js/d3/d3.min.js | 5390 +- .../src/main/webapp/js/nf/nf-status-history.js | 62 +- 3 files changed, 42 insertions(+), 5462 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8a0e2cee/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE old mode 100755 new mode 100644 index 83602d5..8301346 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE @@ -1,26 +1,26 @@ -Copyright (c) 2013, Michael Bostock -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* The name Michael Bostock may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2010-2014, Michael Bostock +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* The name Michael Bostock may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[43/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Updating autocomplete as appropriate. - Restoring line returns between methods.
NIFI-27: - Upgrading jQuery and jQuery UI. - Updating autocomplete as appropriate. - Restoring line returns between methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/888d1baf Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/888d1baf Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/888d1baf Branch: refs/heads/develop Commit: 888d1bafc784e6052b14c4e35f1e1c63c246f743 Parents: 2965258 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 09:40:56 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 09:40:56 2014 -0500 -- .../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 33 +- .../ui/src/main/webapp/css/main.css | 17 - .../ui/src/main/webapp/css/reset.css| 59 - .../ui/src/main/webapp/js/application.js| 67 ++-- 4 files changed, 80 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/888d1baf/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp -- diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp index e882030..3c32299 100644 --- a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp +++ b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp @@ -19,17 +19,29 @@ html head meta http-equiv=Content-Type content=text/html; charset=UTF-8 -script type=text/javascript src=../nifi/js/jquery/jquery-1.7.min.js/script +link rel=stylesheet href=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/slickgrid/css/slick.grid.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/slickgrid/css/slick-default-theme.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/modal/jquery.modal.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/combo/jquery.combo.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/qtip2/jquery.qtip.min.css type=text/css / +link rel=stylesheet href=../nifi/js/codemirror/lib/codemirror.css type=text/css / +link rel=stylesheet href=../nifi/js/codemirror/addon/hint/show-hint.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/nfeditor/jquery.nfeditor.css type=text/css / +link rel=stylesheet href=../nifi/css/reset.css type=text/css / +link rel=stylesheet href=css/main.css type=text/css / +script type=text/javascript src=../nifi/js/jquery/jquery-2.1.1.min.js/script +script src=http://code.jquery.com/jquery-migrate-1.2.1.js;/script script type=text/javascript src=../nifi/js/jquery/jquery.center.js/script script type=text/javascript src=../nifi/js/jquery/jquery.each.js/script script type=text/javascript src=../nifi/js/jquery/jquery.tab.js/script script type=text/javascript src=../nifi/js/jquery/modal/jquery.modal.js/script script type=text/javascript src=../nifi/js/jquery/combo/jquery.combo.js/script script type=text/javascript src=../nifi/js/jquery/jquery.ellipsis.js/script -script type=text/javascript src=../nifi/js/jquery/jquery-ui-1.8.10.custom.min.js/script +script type=text/javascript src=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js/script script type=text/javascript src=../nifi/js/jquery/qtip2/jquery.qtip.min.js/script script type=text/javascript src=../nifi/js/json2.js/script -script type=text/javascript src=../nifi/js/jquery/jquery.event.drag-2.0.min.js/script +script type=text/javascript src=../nifi/js/jquery/jquery.event.drag-2.2.min.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellrangeselector.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js/script @@ -39,24 +51,11 @@ script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.dataview.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.core.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.grid.js/script -script type=text/javascript src=../nifi/js/codemirror/lib/codemirror.js/script -script type=text/javascript
[03/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
deleted file mode 100755
index a085720..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1,8488 +0,0 @@
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function (mod) {
-if (typeof exports == object typeof module == object) // CommonJS
-module.exports = mod();
-else if (typeof define == function define.amd) // AMD
-return define([], mod);
-else // Plain browser env
-this.CodeMirror = mod();
-})(function () {
-use strict;
-
-// BROWSER SNIFFING
-
-// Kludges for bugs and behavior differences that can't be feature
-// detected are enabled based on userAgent etc sniffing.
-
-var gecko = /gecko\/\d/i.test(navigator.userAgent);
-// ie_uptoN means Internet Explorer version N or lower
-var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-var ie_upto7 = ie_upto10 (document.documentMode == null ||
document.documentMode 8);
-var ie_upto8 = ie_upto10 (document.documentMode == null ||
document.documentMode 9);
-var ie_upto9 = ie_upto10 (document.documentMode == null ||
document.documentMode 10);
-var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
-var ie = ie_upto10 || ie_11up;
-var webkit = /WebKit\//.test(navigator.userAgent);
-var qtwebkit = webkit /Qt\/\d+\.\d+/.test(navigator.userAgent);
-var chrome = /Chrome\//.test(navigator.userAgent);
-var presto = /Opera\//.test(navigator.userAgent);
-var safari = /Apple Computer/.test(navigator.vendor);
-var khtml = /KHTML\//.test(navigator.userAgent);
-var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent);
-var mac_geMountainLion = /Mac OS X
1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-var phantom = /PhantomJS/.test(navigator.userAgent);
-
-var ios = /AppleWebKit/.test(navigator.userAgent)
/Mobile\/\w+/.test(navigator.userAgent);
-// This is woefully incomplete. Suggestions for alternative methods
welcome.
-var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera
Mobi|IEMobile/i.test(navigator.userAgent);
-var mac = ios || /Mac/.test(navigator.platform);
-var windows = /win/i.test(navigator.platform);
-
-var presto_version = presto
navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-if (presto_version)
-presto_version = Number(presto_version[1]);
-if (presto_version presto_version = 15) {
-presto = false;
-webkit = true;
-}
-// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-var flipCtrlCmd = mac (qtwebkit || presto (presto_version == null ||
presto_version 12.11));
-var captureRightClick = gecko || (ie !ie_upto8);
-
-// Optimize some code when these features are not used.
-var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-// EDITOR CONSTRUCTOR
-
-// A CodeMirror instance represents an editor. This is the object
-// that user code is usually dealing with.
-
-function CodeMirror(place, options) {
-if (!(this instanceof CodeMirror))
-return new CodeMirror(place, options);
-
-this.options = options = options || {};
-// Determine effective options based on given values and defaults.
-for (var opt in defaults)
-if (!options.hasOwnProperty(opt))
-options[opt] = defaults[opt];
-setGuttersForLineNumbers(options);
-
-var doc = options.value;
-if (typeof doc == string)
-doc = new Doc(doc, options.mode);
-this.doc = doc;
-
-var display = this.display = new Display(place, doc);
-display.wrapper.CodeMirror = this;
-updateGutters(this);
-themeChanged(this);
-if (options.lineWrapping)
-this.display.wrapper.className += CodeMirror-wrap;
-if (options.autofocus !mobile)
-focusInput(this);
-
-this.state = {
-keyMaps: [], // stores maps added by addKeyMap
-overlays: [], // highlighting overlays, as added by addOverlay
-modeGen: 0, // bumped when mode/overlay changes, used to
invalidate highlighting info
-overwrite: false, focused: false,
-suppressEdits: false, // used to
[49/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
--
diff --git
a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
old mode 100755
new mode 100644
index 5ce272f..340d0a0
---
a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
+++
b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/jquery/jqgrid/js/jquery.jqGrid.min.js
@@ -1,416 +1,545 @@
/*
- * jqGrid 3.6.5 - jQuery Grid
- * Copyright (c) 2008, Tony Tomov, t...@trirand.com
- * Dual licensed under the MIT and GPL licenses
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl-2.0.html
- * Date:2010-05-05
- * Modules: grid.base.js; jquery.fmatter.js; grid.custom.js; grid.common.js;
grid.formedit.js; jquery.searchFilter.js; grid.inlinedit.js; grid.celledit.js;
jqModal.js; jqDnR.js; grid.subgrid.js; grid.treegrid.js; grid.import.js;
JsonXml.js; grid.setcolumns.js; grid.postext.js; grid.tbltogrid.js;
grid.jqueryui.js;
- */
-(function(b){b.jgrid = b.jgrid || {}; b.extend(b.jgrid,
{htmlDecode:function(f){if (f == nbsp; || f == #160; || f.length == 1
f.charCodeAt(0) == 160)return; return!f?f:String(f).replace(/amp;/g,
).replace(/gt;/g, ).replace(/lt;/g, ).replace(/quot;/g, '')},
htmlEncode:function(f){return!f?f:String(f).replace(//g,
amp;).replace(//g, gt;).replace(//g, lt;).replace(/\/g, quot;)},
format:function(f){var k = b.makeArray(arguments).slice(1); if (f ===
undefined)f = ; return f.replace(/\{(\d+)\}/g, function(i,
-h){return k[h]})}, getCellIndex:function(f){f = b(f); f = (!f.is(td)
!f.is(th)?f.closest(td,th):f)[0]; if (b.browser.msie)return b.inArray(f,
f.parentNode.cells); return f.cellIndex}, stripHtml:function(f){f += ; var k
= /([^]*|'[^']*'|[^'])*/gi; if (f)return(f = f.replace(k, )) f !==
nbsp; f !== #160;?f.replace(/\/g, '):; else return f},
stringToDoc:function(f){var k; if (typeof f !== string)return f; try{k = (new
DOMParser).parseFromString(f, text/xml)} catch (i){k = new
ActiveXObject(Microsoft.XMLDOM);
-k.async = false; k.loadXML(f)}return k k.documentElement
k.documentElement.tagName != parsererror?k:null}, parse:function(f){f = f; if
(f.substr(0, 9) == while(1);)f = f.substr(9); if (f.substr(0, 2) == /*)f =
f.substr(2, f.length - 4); f || (f = {}); return b.jgrid.useJSON === true
typeof JSON === object typeof JSON.parse ===
function?JSON.parse(f):eval(( + f + ))}, jqID:function(f){f += ; return
f.replace(/([\.\:\[\]])/g, \\$1)}, ajaxOptions:{},
extend:function(f){b.extend(b.fn.jqGrid, f); this.no_legacy_api ||
b.fn.extend(f)}});
-b.fn.jqGrid = function(f){if (typeof f == string){var k =
b.fn.jqGrid[f]; if (!k)throwjqGrid - No such method: + f; var i =
b.makeArray(arguments).slice(1); return k.apply(this, i)}return
this.each(function(){if (!this.grid){var h = b.extend(true, {url:,
height:150, page:1, rowNum:20, records:0, pager:, pgbuttons:true,
pginput:true, colModel:[], rowList:[], colNames:[], sortorder:asc,
sortname:, datatype:xml, mtype:GET, altRows:false, selarrrow:[],
savedRow:[], shrinkToFit:true, xmlReader:{}, jsonReader:{}, subGrid:false,
-subGridModel:[], reccount:0, lastpage:0, lastsort:0,
selrow:null, beforeSelectRow:null, onSelectRow:null, onSortCol:null,
ondblClickRow:null, onRightClickRow:null, onPaging:null, onSelectAll:null,
loadComplete:null, gridComplete:null, loadError:null, loadBeforeSend:null,
afterInsertRow:null, beforeRequest:null, onHeaderClick:null, viewrecords:false,
loadonce:false, multiselect:false, multikey:false, editurl:null, search:false,
caption:, hidegrid:true, hiddengrid:false, postData:{}, userData:{},
treeGrid:false, treeGridModel:nested,
-treeReader:{}, treeANode: - 1, ExpandColumn:null,
tree_root_level:0, prmNames:{page:page, rows:rows, sort:sidx,
order:sord, search:_search, nd:nd, id:id, oper:oper, editoper:edit,
addoper:add, deloper:del, subgridid:id, npage:null}, forceFit:false,
gridstate:visible, cellEdit:false, cellsubmit:remote, nv:0,
loadui:enable, toolbar:[false, ], scroll:false, multiboxonly:false,
deselectAfterSort:true, scrollrows:false, autowidth:false, scrollOffset:18,
cellLayout:5, subGridWidth:20, multiselectWidth:20,
-gridview:false, rownumWidth:25, rownumbers:false,
pagerpos:center, recordpos:right, footerrow:false, userDataOnFooter:false,
hoverrows:true, altclass:ui-priority-secondary, viewsortcols:[false,
vertical, true], resizeclass:, autoencode:false, remapColumns:[],
ajaxGridOptions:{}, direction:ltr, toppager:false, headertitles:false,
scrollTimeout:200}, b.jgrid.defaults, f || {}), g = {headers:[], cols:[],
[36/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 9e2514c..cdc3ea7 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -72,14 +72,17 @@ nf.Common = {
}
}
},
+
/**
* Determines if the current broswer supports SVG.
*/
SUPPORTS_SVG: !!document.createElementNS
!!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect,
+
/**
* The authorities for the current user.
*/
authorities: undefined,
+
/**
* Sets the authorities for the current user.
*
@@ -88,6 +91,7 @@ nf.Common = {
setAuthorities: function (roles) {
nf.Common.authorities = roles;
},
+
/**
* Loads a script at the specified URL. Supports caching the script on the
browser.
*
@@ -100,6 +104,7 @@ nf.Common = {
url: url
});
},
+
/**
* Determines whether the current user can access provenance.
*
@@ -117,6 +122,7 @@ nf.Common = {
}
return canAccessProvenance;
},
+
/**
* Returns whether or not the current user is a DFM.
*/
@@ -132,6 +138,7 @@ nf.Common = {
}
return dfm;
},
+
/**
* Returns whether or not the current user is a DFM.
*/
@@ -147,6 +154,7 @@ nf.Common = {
}
return admin;
},
+
/**
* Adds a mouse over effect for the specified selector using
* the specified styles.
@@ -163,6 +171,7 @@ nf.Common = {
});
return $(selector).addClass(normalStyle);
},
+
/**
* Method for handling ajax errors.
*
@@ -237,6 +246,7 @@ nf.Common = {
nf.Common.closeCanvas();
}
},
+
/**
* Closes the canvas by removing the splash screen and stats poller.
*/
@@ -256,6 +266,7 @@ nf.Common = {
nf.Canvas.stopStatusPolling();
}
},
+
/**
* Populates the specified field with the specified value. If the value is
* undefined, the field will read 'No value set.' If the value is an empty
@@ -273,6 +284,7 @@ nf.Common = {
return $('#' + target).text(value);
}
},
+
/**
* Clears the specified field. Removes any style that may have been applied
* by a preceeding call to populateField.
@@ -282,6 +294,7 @@ nf.Common = {
clearField: function (target) {
return $('#' + target).removeClass('unset blank').text('');
},
+
/**
* Formats the tooltip for the specified property.
*
@@ -321,6 +334,7 @@ nf.Common = {
return null;
}
},
+
/**
* Formats the specified property (name and value) accordingly.
*
@@ -330,6 +344,7 @@ nf.Common = {
formatProperty: function (name, value) {
return 'divspan class=label' + nf.Common.formatValue(name) + ':
/span' + nf.Common.formatValue(value) + '/div';
},
+
/**
* Formats the specified value accordingly.
*
@@ -346,6 +361,7 @@ nf.Common = {
return 'span class=unsetNo value set/span';
}
},
+
/**
* HTML escapes the specified string. If the string is null
* or undefined, an empty string is returned.
@@ -372,6 +388,7 @@ nf.Common = {
}
};
}()),
+
/**
* Creates a form inline in order to submit the specified params to the
specified URL
* using the specified method.
@@ -407,6 +424,7 @@ nf.Common = {
window.onbeforeunload = previousBeforeUnload;
}
},
+
/**
* Formats the specified array as an unordered list. If the array is not
an
* array, null is returned.
@@ -429,6 +447,7 @@ nf.Common = {
return null;
}
},
+
/**
* Extracts the contents of the specified str after the strToFind. If the
* strToFind is not found or the last part of the str, an empty string is
@@ -448,6 +467,7 @@ nf.Common = {
}
return result;
},
+
/**
* Updates the mouse pointer.
*
@@ -461,6 +481,7 @@ nf.Common = {
$('#' + domId).removeClass('pointer');
}
},
+
/**
* Constants for time duration formatting.
*/
@@ -468,6 +489,7 @@ nf.Common = {
MILLIS_PER_HOUR: 360,
MILLIS_PER_MINUTE: 6,
MILLIS_PER_SECOND: 1000,
+
/**
*
[30/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
deleted file mode 100755
index af79a71..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
+++ /dev/null
@@ -1,2934 +0,0 @@
-/*! jQuery v1.7 jquery.com | jquery.org/license */
-(function (a, b) {
-function cA(a) {
-return f.isWindow(a) ? a : a.nodeType === 9 ? a.defaultView ||
a.parentWindow : !1
-}
-function cx(a) {
-if (!cm[a]) {
-var b = c.body, d = f( + a + ).appendTo(b), e =
d.css(display);
-d.remove();
-if (e === none || e === ) {
-cn || (cn = c.createElement(iframe), cn.frameBorder =
cn.width = cn.height = 0), b.appendChild(cn);
-if (!co || !cn.createElement)
-co = (cn.contentWindow || cn.contentDocument).document,
co.write((c.compatMode === CSS1Compat ? !doctype html : ) +
htmlbody), co.close();
-d = co.createElement(a), co.body.appendChild(d), e = f.css(d,
display), b.removeChild(cn)
-}
-cm[a] = e
-}
-return cm[a]
-}
-function cw(a, b) {
-var c = {};
-f.each(cs.concat.apply([], cs.slice(0, b)), function () {
-c[this] = a
-});
-return c
-}
-function cv() {
-ct = b
-}
-function cu() {
-setTimeout(cv, 0);
-return ct = f.now()
-}
-function cl() {
-try {
-return new a.ActiveXObject(Microsoft.XMLHTTP)
-} catch (b) {
-}
-}
-function ck() {
-try {
-return new a.XMLHttpRequest
-} catch (b) {
-}
-}
-function ce(a, c) {
-a.dataFilter (c = a.dataFilter(c, a.dataType));
-var d = a.dataTypes, e = {}, g, h, i = d.length, j, k = d[0], l, m, n,
o, p;
-for (g = 1; g i; g++) {
-if (g === 1)
-for (h in a.converters)
-typeof h == string (e[h.toLowerCase()] =
a.converters[h]);
-l = k, k = d[g];
-if (k === *)
-k = l;
-else if (l !== * l !== k) {
-m = l + + k, n = e[m] || e[* + k];
-if (!n) {
-p = b;
-for (o in e) {
-j = o.split( );
-if (j[0] === l || j[0] === *) {
-p = e[j[1] + + k];
-if (p) {
-o = e[o], o === !0 ? n = p : p === !0 (n =
o);
-break
-}
-}
-}
-}
-!n !p f.error(No conversion from + m.replace( ,
to )), n !== !0 (c = n ? n(c) : p(o(c)))
-}
-}
-return c
-}
-function cd(a, c, d) {
-var e = a.contents, f = a.dataTypes, g = a.responseFields, h, i, j, k;
-for (i in g)
-i in d (c[g[i]] = d[i]);
-while (f[0] === *)
-f.shift(), h === b (h = a.mimeType ||
c.getResponseHeader(content-type));
-if (h)
-for (i in e)
-if (e[i] e[i].test(h)) {
-f.unshift(i);
-break
-}
-if (f[0]in d)
-j = f[0];
-else {
-for (i in d) {
-if (!f[0] || a.converters[i + + f[0]]) {
-j = i;
-break
-}
-k || (k = i)
-}
-j = j || k
-}
-if (j) {
-j !== f[0] f.unshift(j);
-return d[j]
-}
-}
-function cc(a, b, c, d) {
-if (f.isArray(b))
-f.each(b, function (b, e) {
-c || bG.test(a) ? d(a, e) : cc(a + [ + (typeof e == object
|| f.isArray(e) ? b : ) + ], e, c, d)
-});
-else if (!c b != null typeof b == object)
-for (var e in b)
-cc(a + [ + e + ], b[e], c, d);
-else
-d(a, b)
-}
-function cb(a, c) {
-var d, e, g = f.ajaxSettings.flatOptions || {};
-for (d in c)
-c[d] !== b ((g[d] ? a : e || (e = {}))[d] = c[d]);
-e f.extend(!0, a, e)
-}
-function ca(a, c, d, e, f, g) {
-f = f || c.dataTypes[0], g = g || {}, g[f] = !0;
-var h = a[f], i = 0, j = h ? h.length : 0, k = a === bV, l;
-for (; i j (k || !l); i++)
-l = h[i](c, d, e), typeof l
[31/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
deleted file mode 100755
index f9563e1..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
+++ /dev/null
@@ -1,9017 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 3 16:18:21 2011 -0400
- */
-(function (window, undefined) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-navigator = window.navigator,
-location = window.location;
-var jQuery = (function () {
-
-// Define a local copy of jQuery
-var jQuery = function (selector, context) {
-// The jQuery object is actually just the init constructor
'enhanced'
-return new jQuery.fn.init(selector, context, rootjQuery);
-},
-// Map over jQuery in case of overwrite
-_jQuery = window.jQuery,
-// Map over the $ in case of overwrite
-_$ = window.$,
-// A central reference to the root jQuery(document)
-rootjQuery,
-// A simple way to check for HTML strings or ID strings
-// Prioritize #id over tag to avoid XSS via location.hash
(#9521)
-quickExpr = /^(?:[^#]*([\w\W]+)[^]*$|#([\w\-]*)$)/,
-// Check if a string has a non-whitespace character in it
-rnotwhite = /\S/,
-// Used for trimming whitespace
-trimLeft = /^\s+/,
-trimRight = /\s+$/,
-// Check for digits
-rdigit = /\d/,
-// Match a standalone tag
-rsingleTag = /^(\w+)\s*\/?(?:\/\1)?$/,
-// JSON RegExp
-rvalidchars = /^[\],:{}\s]*$/,
-rvalidescape = /\\(?:[\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-rvalidtokens =
/[^\\\n\r]*|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-// Useragent RegExp
-rwebkit = /(webkit)[ \/]([\w.]+)/,
-ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-rmsie = /(msie) ([\w.]+)/,
-rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-// Matches dashed string for camelizing
-rdashAlpha = /-([a-z]|[0-9])/ig,
-rmsPrefix = /^-ms-/,
-// Used by jQuery.camelCase as callback to replace()
-fcamelCase = function (all, letter) {
-return (letter + ).toUpperCase();
-},
-// Keep a UserAgent string for use with jQuery.browser
-userAgent = navigator.userAgent,
-// For matching the engine and version of the browser
-browserMatch,
-// The deferred used on DOM ready
-readyList,
-// The ready event handler
-DOMContentLoaded,
-// Save a reference to some core methods
-toString = Object.prototype.toString,
-hasOwn = Object.prototype.hasOwnProperty,
-push = Array.prototype.push,
-slice = Array.prototype.slice,
-trim = String.prototype.trim,
-indexOf = Array.prototype.indexOf,
-// [[Class]] - type pairs
-class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-constructor: jQuery,
-init: function (selector, context, rootjQuery) {
-var match, elem, ret, doc;
-
-// Handle $(), $(null), or $(undefined)
-if (!selector) {
-return this;
-}
-
-// Handle $(DOMElement)
-if (selector.nodeType) {
-this.context = this[0] = selector;
-this.length = 1;
-return this;
-}
-
-// The body element only exists once, optimize finding it
-if (selector === body !context document.body) {
-this.context = document;
-this[0] = document.body;
-this.selector =
[48/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery, jQuery UI, jqGrid. - Replacing deprecated functionality.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d7b1113a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
--
diff --git
a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
index 1cc8c99..a427e69 100644
--- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
+++ b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/js/nf-common.js
@@ -878,10 +878,11 @@ $(document).ready(function () {
}
function addHoverEffect(selector, normalStyle, overStyle) {
-return $(selector).addClass(normalStyle).live('mouseover', function ()
{
+$(document).on('mouseenter', selector, function () {
$(this).removeClass(normalStyle).addClass(overStyle);
-}).live('mouseout', function () {
+}).on('mouseleave', selector, function () {
$(this).removeClass(overStyle).addClass(normalStyle);
-})
+});
+return $(selector).addClass(normalStyle);
}
});
\ No newline at end of file
[24/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
new file mode 100755
index 000..df6064c
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.10.4 - 2014-12-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e,t){function i(t,i){var
n,a,o,r=t.nodeName.toLowerCase();returnarea===r?(n=t.parentNode,a=n.name,t.hrefamap===n.nodeName.toLowerCase()?(o=e(img[usemap=#+a+])[0],!!os(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:a===r?t.href||i:i)s(t)}function
s(t){return
e.expr.filters.visible(t)!e(t).parents().addBack().filter(function(){returnhidden===e.css(this,visibility)}).length}var
n=0,a=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:1.10.4,keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({focus:function(t){return
function(i,s){returnnumber==typeof i?this.each(function(){var
t=this;setTimeout(function(){e(t).focus(),ss.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),scrollParent:function(){var
t;
return
t=e.ui.ie/(static|relative)/.test(this.css(position))||/absolute/.test(this.css(position))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,position))/(auto|scroll)/.test(e.css(this,overflow)+e.css(this,overflow-y)+e.css(this,overflow-x))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,overflow)+e.css(this,overflow-y)+e.css(this,overflow-x))}).eq(0),/fixed/.test(this.css(position))||!t.length?e(document):t},zIndex:function(i){if(i!==t)return
this.css(zIndex,i);if(this.length)for(var
s,n,a=e(this[0]);a.lengtha[0]!==document;){if(s=a.css(position),(absolute===s||relative===s||fixed===s)(n=parseInt(a.css(zIndex),10),!isNaN(n)0!==n))return
n;a=a.parent()}return 0},uniqueId:function(){return
this.each(function(){this.id||(this.id=ui-id-+
++n)})},removeUniqueId:function(){return
this.each(function(){a.test(this.id)e(this).removeAttr(id)})}}),e.extend(e.expr[:],{data:e.
expr.createPseudo?e.expr.createPseudo(function(t){return
function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(t){return
i(t,!isNaN(e.attr(t,tabindex)))},tabbable:function(t){var
s=e.attr(t,tabindex),n=isNaN(s);return(n||s=0)i(t,!n)}}),e(a).outerWidth(1).jquery||e.each([Width,Height],function(i,s){function
n(t,i,s,n){return
e.each(a,function(){i-=parseFloat(e.css(t,padding+this))||0,s(i-=parseFloat(e.css(t,border+this+Width))||0),n(i-=parseFloat(e.css(t,margin+this))||0)}),i}var
a=Width===s?[Left,Right]:[Top,Bottom],o=s.toLowerCase(),r={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn[inner+s]=function(i){return
i===t?r[inner+s].call(this):this.each(function(){e(this).css(o,n(this,i)+px)})},e.fn[outer+s]=function(t,i){returnnumber!=typeof
t?r[outer+s].call(this,t):this.each(function(){e(this).css(o,n(this,t,!0,i)+px)})}}),e.f
n.addBack||(e.fn.addBack=function(e){return
this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e(a).data(a-b,a).removeData(a-b).data(a-b)(e.fn.removeData=function(t){return
function(i){return
arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie
[\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart=onselectstartin
[34/50] [abbrv] incubator-nifi git commit: NIFI-27: - Better result normalization. - Updated styles.
NIFI-27:
- Better result normalization.
- Updated styles.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d307a13c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d307a13c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d307a13c
Branch: refs/heads/develop
Commit: d307a13c5d4610dd3aa8bdeacab850725bedeb7d
Parents: 68e0898
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Fri Dec 12 10:37:02 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Fri Dec 12 10:37:02 2014 -0500
--
.../framework/web/nifi-web-ui/src/main/webapp/css/header.css | 1 +
.../web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
index 6b096a1..0f08b47 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
@@ -456,6 +456,7 @@ input.search-flow {
overflow: auto;
border: 1px solid #aa;
z-index: 1251;
+border-radius: 0;
}
#search-flow-results .ui-menu .ui-menu-item a.ui-state-focus {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
index c1c4117..2016721 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
@@ -36,6 +36,11 @@ nf.Search = (function () {
var ul = this.menu.element;
ul.width(399);
},
+_normalize: function(searchResults) {
+var items = [];
+items.push(searchResults);
+return items;
+},
_renderMenu: function (ul, items) {
var self = this;
@@ -130,7 +135,7 @@ nf.Search = (function () {
dataType: 'json',
url: config.urls.search
}).done(function (searchResponse) {
-response(searchResponse);
+response(searchResponse.searchResultsDTO);
});
},
select: function (event, ui) {
[26/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
new file mode 100755
index 000..ecac757
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
@@ -0,0 +1,15008 @@
+/*! jQuery UI - v1.10.4 - 2014-12-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function( $, undefined ) {
+
+var uuid = 0,
+ runiqueId = /^ui-id-\d+$/;
+
+// $.ui might exist from components with no dependencies, e.g., $.ui.position
+$.ui = $.ui || {};
+
+$.extend( $.ui, {
+ version: 1.10.4,
+
+ keyCode: {
+ BACKSPACE: 8,
+ COMMA: 188,
+ DELETE: 46,
+ DOWN: 40,
+ END: 35,
+ ENTER: 13,
+ ESCAPE: 27,
+ HOME: 36,
+ LEFT: 37,
+ NUMPAD_ADD: 107,
+ NUMPAD_DECIMAL: 110,
+ NUMPAD_DIVIDE: 111,
+ NUMPAD_ENTER: 108,
+ NUMPAD_MULTIPLY: 106,
+ NUMPAD_SUBTRACT: 109,
+ PAGE_DOWN: 34,
+ PAGE_UP: 33,
+ PERIOD: 190,
+ RIGHT: 39,
+ SPACE: 32,
+ TAB: 9,
+ UP: 38
+ }
+});
+
+// plugins
+$.fn.extend({
+ focus: (function( orig ) {
+ return function( delay, fn ) {
+ return typeof delay === number ?
+ this.each(function() {
+ var elem = this;
+ setTimeout(function() {
+ $( elem ).focus();
+ if ( fn ) {
+ fn.call( elem );
+ }
+ }, delay );
+ }) :
+ orig.apply( this, arguments );
+ };
+ })( $.fn.focus ),
+
+ scrollParent: function() {
+ var scrollParent;
+ if (($.ui.ie
(/(static|relative)/).test(this.css(position))) ||
(/absolute/).test(this.css(position))) {
+ scrollParent = this.parents().filter(function() {
+ return
(/(relative|absolute|fixed)/).test($.css(this,position))
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
+ }).eq(0);
+ } else {
+ scrollParent = this.parents().filter(function() {
+ return
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
+ }).eq(0);
+ }
+
+ return (/fixed/).test(this.css(position)) ||
!scrollParent.length ? $(document) : scrollParent;
+ },
+
+ zIndex: function( zIndex ) {
+ if ( zIndex !== undefined ) {
+ return this.css( zIndex, zIndex );
+ }
+
+ if ( this.length ) {
+ var elem = $( this[ 0 ] ), position, value;
+ while ( elem.length elem[ 0 ] !== document ) {
+ // Ignore z-index if position is set to a value
where z-index is ignored by the browser
+ // This makes behavior of this function
consistent across browsers
+ // WebKit always returns auto if the element is
positioned
+
[10/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
index b4a2d7d..c12bae9 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
@@ -1,2832 +1,3422 @@
-/**
- * @license
- * (c) 2009-2012 Michael Leibman
- * michael{dot}leibman{at}gmail{dot}com
- * http://github.com/mleibman/slickgrid
- *
- * Distributed under MIT license.
- * All rights reserved.
- *
- * SlickGrid v2.0
- *
- * NOTES:
- * Cell/row DOM manipulations are done directly bypassing jQuery's DOM
manipulation methods.
- * This increases the speed dramatically, but can only be done safely
because there are no event handlers
- * or data associated with any cell/row DOM nodes. Cell editors must make
sure they implement .destroy()
- * and do proper cleanup.
- */
-
-// make sure required JavaScript modules are loaded
-if (typeof jQuery === undefined) {
-throw SlickGrid requires jquery module to be loaded;
-}
-if (!jQuery.fn.drag) {
-throw SlickGrid requires jquery.event.drag module to be loaded;
-}
-if (typeof Slick === undefined) {
-throw slick.core.js not loaded;
-}
-
-
-(function ($) {
-// Slick.Grid
-$.extend(true, window, {
-Slick: {
-Grid: SlickGrid
-}
-});
-
-// shared across all grids on the page
-var scrollbarDimensions;
-var maxSupportedCssHeight; // browser's breaking point
-
-
//
-// SlickGrid class implementation (available as Slick.Grid)
-
-/**
- * Creates a new instance of the grid.
- * @class SlickGrid
- * @constructor
- * @param {Node} container Container node to create the
grid in.
- * @param {Array,Object} dataAn array of objects for
databinding.
- * @param {Array} columns An array of column definitions.
- * @param {Object}options Grid options.
- **/
-function SlickGrid(container, data, columns, options) {
-// settings
-var defaults = {
-explicitInitialization: false,
-rowHeight: 25,
-defaultColumnWidth: 80,
-enableAddRow: false,
-leaveSpaceForNewRows: false,
-editable: false,
-autoEdit: true,
-enableCellNavigation: true,
-enableColumnReorder: true,
-asyncEditorLoading: false,
-asyncEditorLoadDelay: 100,
-forceFitColumns: false,
-enableAsyncPostRender: false,
-asyncPostRenderDelay: 60,
-autoHeight: false,
-editorLock: Slick.GlobalEditorLock,
-showHeaderRow: false,
-headerRowHeight: 25,
-showTopPanel: false,
-topPanelHeight: 25,
-formatterFactory: null,
-editorFactory: null,
-cellFlashingCssClass: flashing,
-selectedCellCssClass: selected,
-multiSelect: true,
-enableTextSelectionOnCells: false,
-dataItemColumnValueExtractor: null,
-fullWidthRows: false,
-multiColumnSort: false,
-defaultFormatter: defaultFormatter
-};
-
-var columnDefaults = {
-name: ,
-resizable: true,
-sortable: false,
-minWidth: 30,
-rerenderOnResize: false,
-headerCssClass: null
-};
-
-// scroller
-var th; // virtual height
-var h;// real scrollable height
-var ph; // page height
-var n;// number of pages
-var cj; // jumpiness coefficient
-
-var page = 0; // current page
-var offset = 0; // current page offset
-var scrollDir = 1;
-
-// private
-var initialized = false;
-var $container;
-var uid = slickgrid_ + Math.round(100 * Math.random());
-var self = this;
-var $focusSink;
-var $headerScroller;
-var $headers;
-var $headerRow, $headerRowScroller;
-var $topPanelScroller;
-var $topPanel;
-var $viewport;
-var $canvas;
-var $style;
-var stylesheet, columnCssRulesL, columnCssRulesR;
-var viewportH, viewportW;
-var canvasWidth;
-var viewportHasHScroll, viewportHasVScroll;
-var
[46/50] [abbrv] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a016bf47/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
index 91363b8..cdf4ae4 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
@@ -1,269 +1,259 @@
.minicolors {
-position: relative;
-}
-
-.minicolors-sprite {
-background-image:
url(data:image/png;base64,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
[20/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
new file mode 100644
index 000..11b3fbc
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
@@ -0,0 +1,16 @@
+/* CodeMirror - Minified Bundled
+ Generated on 12/10/2014 with http://codemirror.net/doc/compress.html
+ Version: 4.8
+
+ CodeMirror Library:
+ - codemirror.js
+ Add-ons:
+ - matchbrackets.js
+ - show-hint.js
+ */
+
+!function(a){if(object==typeof exportsobject==typeof
module)module.exports=a();else{if(function==typeof definedefine.amd)return
define([],a);this.CodeMirror=a()}}(function(){use strict;function
w(a,b){if(!(this instanceof w))return new
w(a,b);this.options=b=b?Qg(b):{},Qg(ie,b,!1),J(b);var
c=b.value;string==typeof c(c=new Lf(c,b.mode)),this.doc=c;var
f=this.display=new
x(a,c);f.wrapper.CodeMirror=this,F(this),D(this),b.lineWrapping(this.display.wrapper.className+=
CodeMirror-wrap),b.autofocus!o_c(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new
Gg,keySeq:null},d11esetTimeout(Rg($c,this,!0),20),cd(this),ih(),Ac(this),this.curOp.forceUpdate=!0,Pf(this,c),b.autofocus!o||bh()==f.input?setTimeout(Rg(Hd,this),20):Id(this);for(var
g in je)je.hasOwnProperty(g)je[g](this,b[g],le);P(this);for(var
h=0;hpe.length;++h)pe[h](this);Cc(this)}function x(a,b){var c
=this,g=c.input=Yg(textarea,null,null,position: absolute; padding: 0;
width: 1px; height: 1em; outline:
none);f?g.style.width=1000px:g.setAttribute(wrap,off),n(g.style.border=1px
solid
black),g.setAttribute(autocorrect,off),g.setAttribute(autocapitalize,off),g.setAttribute(spellcheck,false),c.inputDiv=Yg(div,[g],null,overflow:
hidden; position: relative; width: 3px; height:
0px;),c.scrollbarH=Yg(div,[Yg(div,null,null,height: 100%; min-height:
1px)],CodeMirror-hscrollbar),c.scrollbarV=Yg(div,[Yg(div,null,null,min-width:
1px)],CodeMirror-vscrollbar),c.scrollbarFiller=Yg(div,null,CodeMirror-scrollbar-filler),c.gutterFiller=Yg(div,null,CodeMirror-gutter-filler),c.lineDiv=Yg(div,null,CodeMirror-code),c.selectionDiv=Yg(div,null,null,position:
relative; z-index:
1),c.cursorDiv=Yg(div,null,CodeMirror-cursors),c.measure=Yg(div,null,CodeMirror-measure),c.lineMeasure=Yg(div,null,CodeMirror-measure),c.lineSpace=Yg(div,[
c.measure,c.lineMeasure,c.selectionDiv,c.cursorDiv,c.lineDiv],null,position:
relative; outline:
none),c.mover=Yg(div,[Yg(div,[c.lineSpace],CodeMirror-lines)],null,position:
relative),c.sizer=Yg(div,[c.mover],CodeMirror-sizer),c.heightForcer=Yg(div,null,null,position:
absolute; height: +Bg+px; width:
1px;),c.gutters=Yg(div,null,CodeMirror-gutters),c.lineGutter=null,c.scroller=Yg(div,[c.sizer,c.heightForcer,c.gutters],CodeMirror-scroll),c.scroller.setAttribute(tabIndex,-1),c.wrapper=Yg(div,[c.inputDiv,c.scrollbarH,c.scrollbarV,c.scrollbarFiller,c.gutterFiller,c.scroller],CodeMirror),d8e(c.gutters.style.zIndex=-1,c.scroller.style.paddingRight=0),n(g.style.width=0px),f||(c.scroller.draggable=!0),k(c.inputDiv.style.height=1px,c.inputDiv.style.position=absolute),d8e(c.scrollbarH.style.minHeight=c.scrollbarV.style.minWidth=18px),a(a.appendChild?a.appendChild(c.wrapper):a(c.wrapper)),c.viewFrom=c.viewTo=b.first,c.view=[],c.external
Measured=null,c.viewOffset=0,c.lastWrapHeight=c.lastWrapWidth=0,c.updateLineNumbers=null,c.lineNumWidth=c.lineNumInnerWidth=c.lineNumChars=null,c.prevInput=,c.alignWidgets=!1,c.pollingFast=!1,c.poll=new
Gg,c.cachedCharWidth=c.cachedTextHeight=c.cachedPaddingH=null,c.inaccurateSelection=!1,c.maxLine=null,c.maxLineLength=0,c.maxLineChanged=!1,c.wheelDX=c.wheelDY=c.wheelStartX=c.wheelStartY=null,c.shift=!1,c.selForContextMenu=null}function
y(a){a.doc.mode=w.getMode(a.options,a.doc.modeOption),z(a)}function
z(a){a.doc.iter(function(a){a.stateAfter(a.stateAfter=null),a.styles(a.styles=null)}),a.doc.frontier=a.doc.first,Tb(a,100),a.state.modeGen++,a.curOpPc(a)}function
A(a){a.options.lineWrapping?(eh(a.display.wrapper,CodeMirror-wrap),a.display.sizer.style.minWidth=):(dh(a.display.wrapper,CodeMirror-wrap),I(a)),C(a),Pc(a),kc(a),setTimeout(function(){M(a)},100)}function
B(a){var
b=wc(a.display),c=a.options.lineWrapping,d=cMath.max(5,a.display.scroller.clientWidth/xc(a.displ
ay)-3);return function(e){if(ef(a.doc,e))return 0;var f=0;if(e.widgets)for(var
g=0;ge.widgets.length;g++)e.widgets[g].height(f+=e.widgets[g].height);return
c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function C(a){var
[15/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of D3.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8a0e2cee/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
index f570082..178207e 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
@@ -60,13 +60,6 @@ nf.StatusHistory = (function () {
};
/**
- * version 3.4+ of D3 provides a mechanism for specifying
- * a number of custom formatters. this achieves similar function
- * until we're able to upgrade.
- */
-var timeFormats = null;
-
-/**
* The time offset of the server.
*/
var serverTimeOffset = null;
@@ -373,26 +366,21 @@ nf.StatusHistory = (function () {
visible: instances[instance.id] === true
});
});
-
+
// --
// custom time axis formatter
// --
-// create the formatting function
-var customTimeFormat = function (d) {
-var formatter;
-
-// identify the most appropriate formatter for this date
-$.each(timeFormats, function (_, timeFormat) {
-if (timeFormat[1](d)) {
-formatter = timeFormat;
-return false;
-}
-});
-
-// return the formatter date
-return formatter[0](d);
-};
+var customTimeFormat = d3.time.format.multi([
+[':%S.%L', function (d) { return d.getMilliseconds(); }],
+[':%S', function (d) { return d.getSeconds(); }],
+['%H:%M', function (d) { return d.getMinutes(); }],
+['%H:%M', function (d) { return d.getHours(); }],
+['%a %d', function (d) { return d.getDay() d.getDate() !== 1;
}],
+['%b %d', function (d) { return d.getDate() !== 1; }],
+['%B', function (d) { return d.getMonth(); }],
+['%Y', function () { return true; }]
+]);
// --
// main chart
@@ -1136,34 +1124,6 @@ nf.StatusHistory = (function () {
init: function (timeOffset) {
serverTimeOffset = timeOffset;
-// initialize the time formats
-timeFormats = [
-[d3.time.format(':%S.%L'), function (d) {
-return d.getMilliseconds();
-}],
-[d3.time.format(':%S'), function (d) {
-return d.getSeconds();
-}],
-[d3.time.format('%H:%M'), function (d) {
-return d.getMinutes();
-}],
-[d3.time.format('%H:%M'), function (d) {
-return d.getHours();
-}],
-[d3.time.format('%a %d'), function (d) {
-return d.getDay() d.getDate() !== 1;
-}],
-[d3.time.format('%b %d'), function (d) {
-return d.getDate() !== 1;
-}],
-[d3.time.format('%B'), function (d) {
-return d.getMonth();
-}],
-[d3.time.format('%Y'), function () {
-return true;
-}]
-];
-
nf.Common.addHoverEffect('#status-history-refresh-button',
'button-refresh', 'button-refresh-hover').click(function () {
var statusHistory =
$('#status-history-dialog').data('status-history');
if (statusHistory !== null) {
[38/50] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index 864eb70..f181016 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -112,14 +112,14 @@ nf.BulletinBoard = (function () {
type: 'GET',
url: config.urls.controllerAbout,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var aboutDetails = response.about;
var bulletinBoardTitle = aboutDetails.title + ' Bulletin Board';
// set the document title and the about title
document.title = bulletinBoardTitle;
$('#bulletin-board-header-text').text(bulletinBoardTitle);
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
// get the banners if we're not in the shell
var loadBanners = $.Deferred(function (deferred) {
@@ -128,7 +128,7 @@ nf.BulletinBoard = (function () {
type: 'GET',
url: config.urls.banners,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// ensure the banners response is specified
if (nf.Common.isDefinedAndNotNull(response.banners)) {
if
(nf.Common.isDefinedAndNotNull(response.banners.headerText)
response.banners.headerText !== '') {
@@ -160,7 +160,7 @@ nf.BulletinBoard = (function () {
}
deferred.resolve();
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
nf.Common.handleAjaxError(xhr, status, error);
deferred.reject();
});
@@ -170,9 +170,9 @@ nf.BulletinBoard = (function () {
});
return $.Deferred(function (deferred) {
-$.when(getTitle, loadBanners).then(function () {
+$.when(getTitle, loadBanners).done(function () {
deferred.resolve();
-}, function () {
+}).fail(function () {
deferred.reject();
});
}).promise();
@@ -294,7 +294,7 @@ nf.BulletinBoard = (function () {
url: config.urls.bulletinBoard,
data: data,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// ensure the bulletin board was specified
if (nf.Common.isDefinedAndNotNull(response.bulletinBoard)) {
var bulletinBoard = response.bulletinBoard;
@@ -369,7 +369,7 @@ nf.BulletinBoard = (function () {
bulletinContainer.prepend('div
class=bulletin-action#8230;/div');
}
}
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
// likely caused by a invalid regex
if (xhr.status === 404) {
$('#bulletin-error-message').text(xhr.responseText).show();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index f73545d..dc8ca31 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -40,10 +40,10 @@ nf.Actions = (function () {
url: uri,
data: data,
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
// update the revision
nf.Client.setRevision(response.revision);
-}, function (xhr, status, error) {
+}).fail(function (xhr, status, error) {
if (xhr.status === 400 || xhr.status === 404 || xhr.status ===
409) {
nf.Dialog.showOkDialog({
dialogContent: nf.Common.escapeHtml(xhr.responseText),
@@ -86,12 +86,14 @@ nf.Actions
[32/50] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
NIFI-27: - Starting to upgrade jQuery and jQuery UI. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/71e53ae5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/71e53ae5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/71e53ae5 Branch: refs/heads/develop Commit: 71e53ae5664d04c0410e35b098808c0b45d97a28 Parents: 5b0d8a5 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Thu Dec 11 16:02:44 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Thu Dec 11 16:02:44 2014 -0500 -- .../webapp/WEB-INF/pages/bulletin-board.jsp | 7 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp| 7 +- .../src/main/webapp/WEB-INF/pages/cluster.jsp | 7 +- .../src/main/webapp/WEB-INF/pages/counters.jsp | 7 +- .../src/main/webapp/WEB-INF/pages/history.jsp | 7 +- .../main/webapp/WEB-INF/pages/provenance.jsp| 7 +- .../src/main/webapp/WEB-INF/pages/summary.jsp | 7 +- .../src/main/webapp/WEB-INF/pages/templates.jsp | 7 +- .../src/main/webapp/WEB-INF/pages/users.jsp | 7 +- .../WEB-INF/partials/canvas/canvas-header.jsp | 1 + .../nifi-web-ui/src/main/webapp/css/header.css |28 +- .../main/webapp/css/processor-configuration.css | 6 + .../main/webapp/js/jquery/combo/jquery.combo.js | 5 +- .../images/ui-bg_flat_0_aa_40x100.png | Bin 180 - 0 bytes .../images/ui-bg_flat_75_ff_40x100.png | Bin 178 - 0 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 - 0 bytes .../images/ui-bg_glass_65_ff_1x400.png | Bin 105 - 0 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 111 - 0 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 - 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 - 0 bytes .../ui-bg_highlight-soft_75_cc_1x100.png| Bin 101 - 0 bytes .../images/ui-icons_22_256x240.png | Bin 4369 - 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4369 - 0 bytes .../images/ui-icons_454545_256x240.png | Bin 8543 - 0 bytes .../images/ui-icons_88_256x240.png | Bin 4369 - 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4369 - 0 bytes .../images/ui-icons_ff_256x240.png | Bin 8358 - 0 bytes .../css/smoothness/jquery-ui-1.8.10.custom.css | 625 - .../src/main/webapp/js/jquery/jquery-1.7.js | 9017 -- .../src/main/webapp/js/jquery/jquery-1.7.min.js | 2934 .../main/webapp/js/jquery/jquery-2.1.1.min.js | 4 + .../js/jquery/jquery-ui-1.8.10.custom.min.js| 6354 --- .../js/jquery/slickgrid/css/slick.grid.css | 3 +- .../ui-smoothness/images/animated-overlay.gif | Bin 0 - 1738 bytes .../images/ui-bg_flat_0_aa_40x100.png | Bin 0 - 212 bytes .../images/ui-bg_flat_75_ff_40x100.png | Bin 0 - 208 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 - 335 bytes .../images/ui-bg_glass_65_ff_1x400.png | Bin 0 - 207 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 - 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 - 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 - 332 bytes .../ui-bg_highlight-soft_75_cc_1x100.png| Bin 0 - 280 bytes .../images/ui-icons_22_256x240.png | Bin 0 - 6922 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 - 4549 bytes .../images/ui-icons_454545_256x240.png | Bin 0 - 6992 bytes .../images/ui-icons_88_256x240.png | Bin 0 - 6999 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 - 4549 bytes .../jquery/ui-smoothness/jquery-ui-1.10.4.css | 1178 ++ .../js/jquery/ui-smoothness/jquery-ui-1.10.4.js | 15008 + .../ui-smoothness/jquery-ui-1.10.4.min.css | 7 + .../ui-smoothness/jquery-ui-1.10.4.min.js | 7 + .../src/main/webapp/js/nf/canvas/nf-search.js |19 +- 52 files changed, 16272 insertions(+), 18987 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp index 083862d..297a331 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp +++
[05/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
new file mode 100644
index 000..11b3fbc
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
@@ -0,0 +1,16 @@
+/* CodeMirror - Minified Bundled
+ Generated on 12/10/2014 with http://codemirror.net/doc/compress.html
+ Version: 4.8
+
+ CodeMirror Library:
+ - codemirror.js
+ Add-ons:
+ - matchbrackets.js
+ - show-hint.js
+ */
+
+!function(a){if(object==typeof exportsobject==typeof
module)module.exports=a();else{if(function==typeof definedefine.amd)return
define([],a);this.CodeMirror=a()}}(function(){use strict;function
w(a,b){if(!(this instanceof w))return new
w(a,b);this.options=b=b?Qg(b):{},Qg(ie,b,!1),J(b);var
c=b.value;string==typeof c(c=new Lf(c,b.mode)),this.doc=c;var
f=this.display=new
x(a,c);f.wrapper.CodeMirror=this,F(this),D(this),b.lineWrapping(this.display.wrapper.className+=
CodeMirror-wrap),b.autofocus!o_c(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new
Gg,keySeq:null},d11esetTimeout(Rg($c,this,!0),20),cd(this),ih(),Ac(this),this.curOp.forceUpdate=!0,Pf(this,c),b.autofocus!o||bh()==f.input?setTimeout(Rg(Hd,this),20):Id(this);for(var
g in je)je.hasOwnProperty(g)je[g](this,b[g],le);P(this);for(var
h=0;hpe.length;++h)pe[h](this);Cc(this)}function x(a,b){var c
=this,g=c.input=Yg(textarea,null,null,position: absolute; padding: 0;
width: 1px; height: 1em; outline:
none);f?g.style.width=1000px:g.setAttribute(wrap,off),n(g.style.border=1px
solid
black),g.setAttribute(autocorrect,off),g.setAttribute(autocapitalize,off),g.setAttribute(spellcheck,false),c.inputDiv=Yg(div,[g],null,overflow:
hidden; position: relative; width: 3px; height:
0px;),c.scrollbarH=Yg(div,[Yg(div,null,null,height: 100%; min-height:
1px)],CodeMirror-hscrollbar),c.scrollbarV=Yg(div,[Yg(div,null,null,min-width:
1px)],CodeMirror-vscrollbar),c.scrollbarFiller=Yg(div,null,CodeMirror-scrollbar-filler),c.gutterFiller=Yg(div,null,CodeMirror-gutter-filler),c.lineDiv=Yg(div,null,CodeMirror-code),c.selectionDiv=Yg(div,null,null,position:
relative; z-index:
1),c.cursorDiv=Yg(div,null,CodeMirror-cursors),c.measure=Yg(div,null,CodeMirror-measure),c.lineMeasure=Yg(div,null,CodeMirror-measure),c.lineSpace=Yg(div,[
c.measure,c.lineMeasure,c.selectionDiv,c.cursorDiv,c.lineDiv],null,position:
relative; outline:
none),c.mover=Yg(div,[Yg(div,[c.lineSpace],CodeMirror-lines)],null,position:
relative),c.sizer=Yg(div,[c.mover],CodeMirror-sizer),c.heightForcer=Yg(div,null,null,position:
absolute; height: +Bg+px; width:
1px;),c.gutters=Yg(div,null,CodeMirror-gutters),c.lineGutter=null,c.scroller=Yg(div,[c.sizer,c.heightForcer,c.gutters],CodeMirror-scroll),c.scroller.setAttribute(tabIndex,-1),c.wrapper=Yg(div,[c.inputDiv,c.scrollbarH,c.scrollbarV,c.scrollbarFiller,c.gutterFiller,c.scroller],CodeMirror),d8e(c.gutters.style.zIndex=-1,c.scroller.style.paddingRight=0),n(g.style.width=0px),f||(c.scroller.draggable=!0),k(c.inputDiv.style.height=1px,c.inputDiv.style.position=absolute),d8e(c.scrollbarH.style.minHeight=c.scrollbarV.style.minWidth=18px),a(a.appendChild?a.appendChild(c.wrapper):a(c.wrapper)),c.viewFrom=c.viewTo=b.first,c.view=[],c.external
Measured=null,c.viewOffset=0,c.lastWrapHeight=c.lastWrapWidth=0,c.updateLineNumbers=null,c.lineNumWidth=c.lineNumInnerWidth=c.lineNumChars=null,c.prevInput=,c.alignWidgets=!1,c.pollingFast=!1,c.poll=new
Gg,c.cachedCharWidth=c.cachedTextHeight=c.cachedPaddingH=null,c.inaccurateSelection=!1,c.maxLine=null,c.maxLineLength=0,c.maxLineChanged=!1,c.wheelDX=c.wheelDY=c.wheelStartX=c.wheelStartY=null,c.shift=!1,c.selForContextMenu=null}function
y(a){a.doc.mode=w.getMode(a.options,a.doc.modeOption),z(a)}function
z(a){a.doc.iter(function(a){a.stateAfter(a.stateAfter=null),a.styles(a.styles=null)}),a.doc.frontier=a.doc.first,Tb(a,100),a.state.modeGen++,a.curOpPc(a)}function
A(a){a.options.lineWrapping?(eh(a.display.wrapper,CodeMirror-wrap),a.display.sizer.style.minWidth=):(dh(a.display.wrapper,CodeMirror-wrap),I(a)),C(a),Pc(a),kc(a),setTimeout(function(){M(a)},100)}function
B(a){var
b=wc(a.display),c=a.options.lineWrapping,d=cMath.max(5,a.display.scroller.clientWidth/xc(a.displ
ay)-3);return function(e){if(ef(a.doc,e))return 0;var f=0;if(e.widgets)for(var
g=0;ge.widgets.length;g++)e.widgets[g].height(f+=e.widgets[g].height);return
c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function C(a){var
[16/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of D3.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8a0e2cee/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
old mode 100755
new mode 100644
index 862fcb2..ddaf546
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/d3.min.js
@@ -1,5385 +1,5 @@
-d3 = function () {
-function n(n) {
-return null != n !isNaN(n)
-}
-function t(n) {
-return n.length
-}
-function e(n) {
-for (var t = 1; n * t % 1; )
-t *= 10;
-return t
-}
-function r(n, t) {
-try {
-for (var e in t)
-Object.defineProperty(n.prototype, e, {value: t[e],
enumerable: !1})
-} catch (r) {
-n.prototype = t
-}
-}
-function u() {
-}
-function i() {
-}
-function o(n, t, e) {
-return function () {
-var r = e.apply(t, arguments);
-return r === t ? n : r
-}
-}
-function a(n, t) {
-if (t in n)
-return t;
-t = t.charAt(0).toUpperCase() + t.substring(1);
-for (var e = 0, r = Co.length; r e; ++e) {
-var u = Co[e] + t;
-if (u in n)
-return u
-}
-}
-function c() {
-}
-function l() {
-}
-function s(n) {
-function t() {
-for (var t, r = e, u = -1, i = r.length; ++u i; )
-(t = r[u].on) t.apply(this, arguments);
-return n
-}
-var e = [], r = new u;
-return t.on = function (t, u) {
-var i, o = r.get(t);
-return arguments.length 2 ? o o.on : (o (o.on = null, e =
e.slice(0, i = e.indexOf(o)).concat(e.slice(i + 1)), r.remove(t)), u
e.push(r.set(t, {on: u})), n)
-}, t
-}
-function f() {
-vo.event.preventDefault()
-}
-function h() {
-for (var n, t = vo.event; n = t.sourceEvent; )
-t = n;
-return t
-}
-function g(n) {
-for (var t = new l, e = 0, r = arguments.length; ++e r; )
-t[arguments[e]] = s(t);
-return t.of = function (e, r) {
-return function (u) {
-try {
-var i = u.sourceEvent = vo.event;
-u.target = n, vo.event = u, t[u.type].apply(e, r)
-} finally {
-vo.event = i
-}
-}
-}, t
-}
-function p(n) {
-return jo(n, Oo), n
-}
-function d(n) {
-returnfunction == typeof n ? n : function () {
-return Lo(n, this)
-}
-}
-function v(n) {
-returnfunction == typeof n ? n : function () {
-return Ho(n, this)
-}
-}
-function m(n, t) {
-function e() {
-this.removeAttribute(n)
-}
-function r() {
-this.removeAttributeNS(n.space, n.local)
-}
-function u() {
-this.setAttribute(n, t)
-}
-function i() {
-this.setAttributeNS(n.space, n.local, t)
-}
-function o() {
-var e = t.apply(this, arguments);
-null == e ? this.removeAttribute(n) : this.setAttribute(n, e)
-}
-function a() {
-var e = t.apply(this, arguments);
-null == e ? this.removeAttributeNS(n.space, n.local) :
this.setAttributeNS(n.space, n.local, e)
-}
-return n = vo.ns.qualify(n), null == t ? n.local ? r : e : function
== typeof t ? n.local ? a : o : n.local ? i : u
-}
-function y(n) {
-return n.trim().replace(/\s+/g, )
-}
-function M(n) {
-return new RegExp((?:^|\\s+) + vo.requote(n) + (?:\\s+|$), g)
-}
-function x(n, t) {
-function e() {
-for (var e = -1; ++e u; )
-n[e](this, t)
-}
-function r() {
-for (var e = -1, r = t.apply(this, arguments); ++e u; )
-n[e](this, r)
-}
-n = n.trim().split(/\s+/).map(b);
-var u = n.length;
-returnfunction == typeof t ? r : e
-}
-function b(n) {
-var t = M(n);
-return function (e, r) {
-if (u = e.classList)
-return r ? u.add(n) : u.remove(n);
-var u = e.getAttribute(class) || ;
-r ? (t.lastIndex = 0, t.test(u) || e.setAttribute(class, y(u +
+ n))) : e.setAttribute(class, y(u.replace(t, )))
-}
-}
-function _(n, t, e) {
-function r() {
-this.style.removeProperty(n)
[08/50] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of qtip2.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/658131de/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
index de35e9a..411a0f8 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.js
@@ -1,706 +1,5 @@
-/*
- * qTip2 - Pretty powerful tooltips
- * http://craigsworks.com/projects/qtip2/
- *
- * Version: 2.0.0pre
- * Copyright 2009-2010 Craig Michael Thompson - http://craigsworks.com
- *
- * Dual licensed under MIT or GPLv2 licenses
- * http://en.wikipedia.org/wiki/MIT_License
- * http://en.wikipedia.org/wiki/GNU_General_Public_License
- *
- * Date: Thu Apr 26 20:40:09 2012 +0100
- *//*jslint browser: true, onevar: true, undef: true, nomen: true, bitwise:
true, regexp: true, newcap: true, immed: true, strict: true *//*global window:
false, jQuery: false, console: false, define: false */// Uses AMD or browser
globals to create a jQuery plugin.
-(function (a) {
-typeof define == function define.amd ? define([jquery], a) :
a(jQuery)
-})(function (a) {
-use strict;
-function v() {
-v.history = v.history || [], v.history.push(arguments);
-if (object == typeof console) {
-var a = console[console.warn ? warn : log], b =
Array.prototype.slice.call(arguments), c;
-typeof arguments[0] == string (b[0] = qTip2: + b[0]), c =
a.apply ? a.apply(console, b) : a(b)
-}
-}
-function w(b) {
-var e;
-if (!b || object != typeof b)
-return c;
-if (b.metadata === d || object != typeof b.metadata)
-b.metadata = {type: b.metadata};
-if (contentin b) {
-if (b.content === d || object != typeof b.content ||
b.content.jquery)
-b.content = {text: b.content};
-e = b.content.text || c, !a.isFunction(e) (!e !e.attr ||
e.length 1 || object == typeof e !e.jquery) (b.content.text = c);
-if (titlein b.content) {
-if (b.content.title === d || object != typeof
b.content.title)
-b.content.title = {text: b.content.title};
-e = b.content.title.text || c, !a.isFunction(e) (!e
!e.attr || e.length 1 || object == typeof e !e.jquery)
(b.content.title.text = c)
-}
-}
-returnpositionin b (b.position === d || object != typeof
b.position) (b.position = {my: b.position, at: b.position}), showin b
(b.show === d || object != typeof b.show) (b.show.jquery ? b.show =
{target: b.show} : b.show = {event: b.show}), hidein b (b.hide === d ||
object != typeof b.hide) (b.hide.jquery ? b.hide = {target: b.hide} :
b.hide = {event: b.hide}), stylein b (b.style === d || object != typeof
b.style) (b.style = {classes: b.style}), a.each(g, function () {
-this.sanitize this.sanitize(b)
-}), b
-}
-function x(r, s, v, x) {
-function H(a) {
-var b = 0, c, d = s, e = a.split(.);
-while (d = d[e[b++]])
-b e.length (c = d);
-return[c || s, e.pop()]
-}
-function I() {
-var a = s.style.widget;
-D.toggleClass(k, a).toggleClass(n, s.style.def !a),
F.content.toggleClass(k + -content, a), F.titlebar
F.titlebar.toggleClass(k + -header, a), F.button F.button.toggleClass(j +
-icon, !a)
-}
-function J(a) {
-F.title (F.titlebar.remove(), F.titlebar = F.title = F.button =
d, a !== c y.reposition())
-}
-function K() {
-var b = s.content.title.button, d = typeof b == string, e = d ?
b : Close tooltip;
-F.button F.button.remove(), b.jquery ? F.button = b : F.button
= a(a /, {class: ui-state-default ui-tooltip-close + (s.style.widget ?
: j + -icon), title: e, aria-label: e}).prepend(a(span /, {class:
ui-icon ui-icon-close, html: times;})),
F.button.appendTo(F.titlebar).attr(role, button).click(function (a) {
-return D.hasClass(l) || y.hide(a), c
-}), y.redraw()
-}
-function L() {
-var c = A + -title;
-F.titlebar J(), F.titlebar = a(div /, {class: j +
-titlebar + (s.style.widget ? ui-widget-header : )}).append(F.title =
a(div /, {id: c, class: j + -title, aria-atomic:
b})).insertBefore(F.content).delegate(.ui-tooltip-close, mousedown keydown
mouseup keyup mouseout, function (b) {
-a(this).toggleClass(ui-state-active ui-state-focus,
b.type.substr(-4) === down)
-
[jira] [Resolved] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Matt Gilman resolved NIFI-27. - Resolution: Fixed Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[11/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
index 2d8a482..04b20d2 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.editors.js
@@ -5,508 +5,508 @@
*/
(function ($) {
-// register namespace
-$.extend(true, window, {
-Slick: {
-Editors: {
-Text: TextEditor,
-Integer: IntegerEditor,
-Date: DateEditor,
-YesNoSelect: YesNoSelectEditor,
-Checkbox: CheckboxEditor,
-PercentComplete: PercentCompleteEditor,
-LongText: LongTextEditor
-}
-}
-});
-
-function TextEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-
-this.init = function () {
-$input = $(INPUT type=text class='editor-text' /)
-.appendTo(args.container)
-.bind(keydown.nav, function (e) {
-if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode ===
$.ui.keyCode.RIGHT) {
-e.stopImmediatePropagation();
-}
-})
-.focus()
-.select();
-};
-
-this.destroy = function () {
-$input.remove();
-};
-
-this.focus = function () {
-$input.focus();
-};
-
-this.getValue = function () {
-return $input.val();
-};
-
-this.setValue = function (val) {
-$input.val(val);
-};
-
-this.loadValue = function (item) {
-defaultValue = item[args.column.field] || ;
-$input.val(defaultValue);
-$input[0].defaultValue = defaultValue;
-$input.select();
-};
-
-this.serializeValue = function () {
-return $input.val();
-};
-
-this.applyValue = function (item, state) {
-item[args.column.field] = state;
-};
-
-this.isValueChanged = function () {
-return (!($input.val() == defaultValue == null))
($input.val() != defaultValue);
-};
-
-this.validate = function () {
-if (args.column.validator) {
-var validationResults = args.column.validator($input.val());
-if (!validationResults.valid) {
-return validationResults;
-}
-}
-
-return {
-valid: true,
-msg: null
-};
-};
-
-this.init();
-}
-
-function IntegerEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-
-this.init = function () {
-$input = $(INPUT type=text class='editor-text' /);
-
-$input.bind(keydown.nav, function (e) {
-if (e.keyCode === $.ui.keyCode.LEFT || e.keyCode ===
$.ui.keyCode.RIGHT) {
-e.stopImmediatePropagation();
-}
-});
-
-$input.appendTo(args.container);
-$input.focus().select();
-};
-
-this.destroy = function () {
-$input.remove();
-};
-
-this.focus = function () {
-$input.focus();
-};
-
-this.loadValue = function (item) {
-defaultValue = item[args.column.field];
-$input.val(defaultValue);
-$input[0].defaultValue = defaultValue;
-$input.select();
-};
-
-this.serializeValue = function () {
-return parseInt($input.val(), 10) || 0;
-};
-
-this.applyValue = function (item, state) {
-item[args.column.field] = state;
-};
-
-this.isValueChanged = function () {
-return (!($input.val() == defaultValue == null))
($input.val() != defaultValue);
-};
-
-this.validate = function () {
-if (isNaN($input.val())) {
-return {
-valid: false,
-msg: Please enter a valid integer
-};
-}
-
-return {
-valid: true,
-msg: null
-};
-};
-
-this.init();
-}
-
-function DateEditor(args) {
-var $input;
-var defaultValue;
-var scope = this;
-var
[44/51] [abbrv] incubator-nifi git commit: Merge branch 'develop' into nifi-27
Merge branch 'develop' into nifi-27 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f10bb3cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f10bb3cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f10bb3cc Branch: refs/heads/NIFI-169 Commit: f10bb3ccade86247b44fe3a1905af94754ab54eb Parents: 888d1ba 1cc3ce5 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 09:44:24 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 09:44:24 2014 -0500 -- .gitignore | 1 + .../nifi/src/main/assembly/dependencies.xml | 12 + misc/build-order.sh | 4 +- misc/nar-maven-plugin/pom.xml | 21 +- .../src/main/java/nifi/NarMojo.java | 4 +- .../nifi/controller/FileSystemSwapManager.java | 33 ++- .../apache/nifi/controller/FlowController.java | 24 +- .../repository/FileSystemRepository.java| 6 + .../repository/StandardProcessSession.java | 134 - .../repository/StandardProvenanceReporter.java | 4 +- .../repository/VolatileContentRepository.java | 5 + .../nifi/remote/StandardRemoteProcessGroup.java | 100 +++ .../org/apache/nifi/util/ReflectionUtils.java | 72 ++--- .../repository/TestStandardProcessSession.java | 283 +++ .../src/main/resources/bin/nifi-status.bat | 8 +- .../resources/src/main/resources/bin/nifi.sh| 4 +- .../src/main/resources/bin/run-nifi.bat | 6 +- .../src/main/resources/bin/start-nifi.bat | 7 +- .../src/main/resources/bin/stop-nifi.bat| 8 +- .../web/nifi-web-api/nb-configuration.xml | 18 -- .../nifi/processors/standard/EvaluateXPath.java | 31 +- .../processors/standard/TestScanContent.java| 2 +- .../VolatileProvenanceRepository.java | 2 + .../nifi/components/PropertyDescriptor.java | 2 +- .../repository/ContentRepository.java | 6 + .../repository/FlowFileSwapManager.java | 5 +- .../nifi/components/TestPropertyDescriptor.java | 59 27 files changed, 651 insertions(+), 210 deletions(-) --
[19/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
old mode 100755
new mode 100644
index 4de1393..e2d4ec2
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
@@ -1,67 +1,97 @@
/* BASICS */
.CodeMirror {
-/* Set height, width, borders, and global font properties here */
-font-family: monospace;
-height: 300px;
+ /* Set height, width, borders, and global font properties here */
+ font-family: monospace;
+ height: 300px;
}
.CodeMirror-scroll {
-/* Set scrolling behaviour here */
-overflow: auto;
+ /* Set scrolling behaviour here */
+ overflow: auto;
}
/* PADDING */
.CodeMirror-lines {
-padding: 4px 0; /* Vertical padding around content */
+ padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
-padding: 0 4px; /* Horizontal padding of content */
+ padding: 0 4px; /* Horizontal padding of content */
}
.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-background-color: white; /* The little square between H and V scrollbars */
+ background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */
.CodeMirror-gutters {
-border-right: 1px solid #ddd;
-background-color: #f7f7f7;
-white-space: nowrap;
+ border-right: 1px solid #ddd;
+ background-color: #f7f7f7;
+ white-space: nowrap;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
-padding: 0 3px 0 5px;
-min-width: 20px;
-text-align: right;
-color: #999;
--moz-box-sizing: content-box;
-box-sizing: content-box;
+ padding: 0 3px 0 5px;
+ min-width: 20px;
+ text-align: right;
+ color: #999;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
}
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
/* CURSOR */
.CodeMirror div.CodeMirror-cursor {
-border-left: 1px solid black;
+ border-left: 1px solid black;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
-border-left: 1px solid silver;
+ border-left: 1px solid silver;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+ width: auto;
+ border: 0;
+ background: #7e7;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+ z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+ width: auto;
+ border: 0;
+ -webkit-animation: blink 1.06s steps(1) infinite;
+ -moz-animation: blink 1.06s steps(1) infinite;
+ animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
-width: auto;
-border: 0;
-background: #7e7;
+@keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
+
/* Can style cursor different in overwrite (non-insert) mode */
div.CodeMirror-overwrite div.CodeMirror-cursor {}
-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }
.CodeMirror-ruler {
-border-left: 1px solid #ccc;
-position: absolute;
+ border-left: 1px solid #ccc;
+ position: absolute;
}
/* DEFAULT THEME */
@@ -70,11 +100,12 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
@@ -94,12 +125,16 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
.cm-s-default .cm-error {color: #f00;}
.cm-invalidchar {color: #f00;}
+/* Default styles for common addons */
+
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror
[04/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
old mode 100755
new mode 100644
index 4de1393..e2d4ec2
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.css
@@ -1,67 +1,97 @@
/* BASICS */
.CodeMirror {
-/* Set height, width, borders, and global font properties here */
-font-family: monospace;
-height: 300px;
+ /* Set height, width, borders, and global font properties here */
+ font-family: monospace;
+ height: 300px;
}
.CodeMirror-scroll {
-/* Set scrolling behaviour here */
-overflow: auto;
+ /* Set scrolling behaviour here */
+ overflow: auto;
}
/* PADDING */
.CodeMirror-lines {
-padding: 4px 0; /* Vertical padding around content */
+ padding: 4px 0; /* Vertical padding around content */
}
.CodeMirror pre {
-padding: 0 4px; /* Horizontal padding of content */
+ padding: 0 4px; /* Horizontal padding of content */
}
.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-background-color: white; /* The little square between H and V scrollbars */
+ background-color: white; /* The little square between H and V scrollbars */
}
/* GUTTER */
.CodeMirror-gutters {
-border-right: 1px solid #ddd;
-background-color: #f7f7f7;
-white-space: nowrap;
+ border-right: 1px solid #ddd;
+ background-color: #f7f7f7;
+ white-space: nowrap;
}
.CodeMirror-linenumbers {}
.CodeMirror-linenumber {
-padding: 0 3px 0 5px;
-min-width: 20px;
-text-align: right;
-color: #999;
--moz-box-sizing: content-box;
-box-sizing: content-box;
+ padding: 0 3px 0 5px;
+ min-width: 20px;
+ text-align: right;
+ color: #999;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
}
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
/* CURSOR */
.CodeMirror div.CodeMirror-cursor {
-border-left: 1px solid black;
+ border-left: 1px solid black;
}
/* Shown when moving in bi-directional text */
.CodeMirror div.CodeMirror-secondarycursor {
-border-left: 1px solid silver;
+ border-left: 1px solid silver;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+ width: auto;
+ border: 0;
+ background: #7e7;
+}
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+ z-index: 1;
+}
+
+.cm-animate-fat-cursor {
+ width: auto;
+ border: 0;
+ -webkit-animation: blink 1.06s steps(1) infinite;
+ -moz-animation: blink 1.06s steps(1) infinite;
+ animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
-width: auto;
-border: 0;
-background: #7e7;
+@keyframes blink {
+ 0% { background: #7e7; }
+ 50% { background: none; }
+ 100% { background: #7e7; }
}
+
/* Can style cursor different in overwrite (non-insert) mode */
div.CodeMirror-overwrite div.CodeMirror-cursor {}
-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }
.CodeMirror-ruler {
-border-left: 1px solid #ccc;
-position: absolute;
+ border-left: 1px solid #ccc;
+ position: absolute;
}
/* DEFAULT THEME */
@@ -70,11 +100,12 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-s-default .cm-atom {color: #219;}
.cm-s-default .cm-number {color: #164;}
.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
.cm-s-default .cm-variable-2 {color: #05a;}
.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
.cm-s-default .cm-comment {color: #a50;}
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
@@ -94,12 +125,16 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
.cm-header, .cm-strong {font-weight: bold;}
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
.cm-s-default .cm-error {color: #f00;}
.cm-invalidchar {color: #f00;}
+/* Default styles for common addons */
+
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
div.CodeMirror
[35/51] [abbrv] incubator-nifi git commit: NIFI-27: - Updating access control configuration for secure ports due to autocomplete upgrade.
NIFI-27:
- Updating access control configuration for secure ports due to autocomplete
upgrade.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fc78752e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fc78752e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fc78752e
Branch: refs/heads/NIFI-169
Commit: fc78752e61fcf82b8a39dbb12bd4a3ff4ce21cb6
Parents: d307a13
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Mon Dec 15 12:02:15 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Mon Dec 15 12:02:15 2014 -0500
--
.../canvas/secure-port-configuration.jsp| 3 +-
.../src/main/webapp/css/port-configuration.css | 16 +--
.../nf/canvas/nf-secure-port-configuration.js | 30 +---
3 files changed, 29 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
index 200ef72..bd87018 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/secure-port-configuration.jsp
@@ -78,4 +78,5 @@
/div
/div
/div
-/div
\ No newline at end of file
+/div
+div id=search-users-results/div
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
index 340c2a4..b8fc87c 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/port-configuration.css
@@ -110,14 +110,26 @@ input.search-users {
color: #888;
}
+#search-users-results .ui-autocomplete {
+max-height: 300px;
+overflow: auto;
+border: 1px solid #aa;
+z-index: 1351;
+border-radius: 0;
+}
+
+#search-users-results .ui-menu .ui-menu-item a.ui-state-focus {
+background: #D4E0E5 !important;
+border: 1px solid #99;
+border-radius: 0;
+}
+
li.search-users-header {
font-weight: bold;
padding-top: 4px;
padding-left: 4px;
padding-right: 4px;
height: 14px;
-float: left;
-clear: left;
}
div.search-users-match-header {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fc78752e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
index 8fe..b21b1bf 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js
@@ -138,17 +138,10 @@ nf.SecurePortConfiguration = (function () {
// initialize the access control auto complete
$.widget('nf.userSearchAutocomplete', $.ui.autocomplete, {
-_response: function (content) {
-if (!this.options.disabled content) {
-this._suggest(content);
-this._trigger('open');
-} else {
-this.close();
-}
-this.pending--;
-if (!this.pending) {
-this.element.removeClass('ui-autocomplete-loading');
-}
+_normalize: function(searchResults) {
+var items = [];
+items.push(searchResults);
+return items;
},
_resizeMenu: function () {
var ul =
[13/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
index aea3567..2f097b1 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.core.js
@@ -5,419 +5,463 @@
*/
(function ($) {
-// register namespace
-$.extend(true, window, {
-Slick: {
-Event: Event,
-EventData: EventData,
-EventHandler: EventHandler,
-Range: Range,
-NonDataRow: NonDataItem,
-Group: Group,
-GroupTotals: GroupTotals,
-EditorLock: EditorLock,
-/***
- * A global singleton editor lock.
- * @class GlobalEditorLock
- * @static
- * @constructor
- */
-GlobalEditorLock: new EditorLock()
-}
-});
+ // register namespace
+ $.extend(true, window, {
+Slick: {
+ Event: Event,
+ EventData: EventData,
+ EventHandler: EventHandler,
+ Range: Range,
+ NonDataRow: NonDataItem,
+ Group: Group,
+ GroupTotals: GroupTotals,
+ EditorLock: EditorLock,
+
+ /***
+ * A global singleton editor lock.
+ * @class GlobalEditorLock
+ * @static
+ * @constructor
+ */
+ GlobalEditorLock: new EditorLock()
+}
+ });
+
+ /***
+ * An event object for passing data to event handlers and letting them
control propagation.
+ * pThis is pretty much identical to how W3C and jQuery implement
events./p
+ * @class EventData
+ * @constructor
+ */
+ function EventData() {
+var isPropagationStopped = false;
+var isImmediatePropagationStopped = false;
/***
- * An event object for passing data to event handlers and letting them
control propagation.
- * pThis is pretty much identical to how W3C and jQuery implement
events./p
- * @class EventData
- * @constructor
+ * Stops event from propagating up the DOM tree.
+ * @method stopPropagation
*/
-function EventData() {
-var isPropagationStopped = false;
-var isImmediatePropagationStopped = false;
-
-/***
- * Stops event from propagating up the DOM tree.
- * @method stopPropagation
- */
-this.stopPropagation = function () {
-isPropagationStopped = true;
-};
-
-/***
- * Returns whether stopPropagation was called on this event object.
- * @method isPropagationStopped
- * @return {Boolean}
- */
-this.isPropagationStopped = function () {
-return isPropagationStopped;
-};
-
-/***
- * Prevents the rest of the handlers from being executed.
- * @method stopImmediatePropagation
- */
-this.stopImmediatePropagation = function () {
-isImmediatePropagationStopped = true;
-};
-
-/***
- * Returns whether stopImmediatePropagation was called on this event
object.\
- * @method isImmediatePropagationStopped
- * @return {Boolean}
- */
-this.isImmediatePropagationStopped = function () {
-return isImmediatePropagationStopped;
-}
-}
+this.stopPropagation = function () {
+ isPropagationStopped = true;
+};
/***
- * A simple publisher-subscriber implementation.
- * @class Event
- * @constructor
+ * Returns whether stopPropagation was called on this event object.
+ * @method isPropagationStopped
+ * @return {Boolean}
*/
-function Event() {
-var handlers = [];
-
-/***
- * Adds an event handler to be called when the event is fired.
- * pEvent handler will receive two arguments - an
codeEventData/code and the codedata/code
- * object the event was fired with.p
- * @method subscribe
- * @param fn {Function} Event handler.
- */
-this.subscribe = function (fn) {
-handlers.push(fn);
-};
-
-/***
- * Removes an event handler added with codesubscribe(fn)/code.
- * @method unsubscribe
- * @param fn {Function} Event handler to be removed.
- */
-this.unsubscribe = function (fn) {
-for (var i = handlers.length - 1; i = 0; i--) {
-if (handlers[i] === fn) {
-handlers.splice(i, 1);
-}
-}
-};
-
-/***
-
[45/51] [abbrv] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a016bf47/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
index 938d85e..6b611fe 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.min.js
@@ -1,11 +1,9 @@
/*
* jQuery MiniColors: A tiny color picker built on jQuery
*
- * Copyright: Cory LaViska for A Beautiful Site, LLC
+ * Copyright Cory LaViska for A Beautiful Site, LLC.
(http://www.abeautifulsite.net/)
*
- * Contributions and bug reports: https://github.com/claviska/jquery-minicolors
- *
- * @license: http://opensource.org/licenses/MIT
+ * Licensed under the MIT license: http://opensource.org/licenses/MIT
*
*/
-jQueryfunction($){function i(i,t){var o=$('div class=minicolors
/'),n=$.minicolors.defaults;i.data(minicolors-initialized)||(t=$.extend(!0,{},n,t),o.addClass(minicolors-theme-+t.theme).toggleClass(minicolors-with-opacity,t.opacity).toggleClass(minicolors-no-data-uris,t.dataUris!==!0),void
0!==t.position$.each(t.position.split(
),function(){o.addClass(minicolors-position-+this)}),i.addClass(minicolors-input).data(minicolors-initialized,!1).data(minicolors-settings,t).prop(size,7).wrap(o).after('div
class=minicolors-panel minicolors-slider-'+t.control+'div
class=minicolors-slider minicolors-spritediv
class=minicolors-picker/div/divdiv class=minicolors-opacity-slider
minicolors-spritediv class=minicolors-picker/div/divdiv
class=minicolors-grid minicolors-spritediv
class=minicolors-grid-inner/divdiv
class=minicolors-pickerdiv/div/div/div/div'),t.inline||(i.after('span
class=minicolors-swatch minicolors-spr
itespan
class=minicolors-swatch-color/span/span'),i.next(.minicolors-swatch).on(click,function(t){t.preventDefault(),i.focus()})),i.parent().find(.minicolors-panel).on(selectstart,function(){return!1}).end(),t.inlinei.parent().addClass(minicolors-inline),e(i,!1),i.data(minicolors-initialized,!0))}function
t(i){var
t=i.parent();i.removeData(minicolors-initialized).removeData(minicolors-settings).removeProp(size).removeClass(minicolors-input),t.before(i).remove()}function
o(i){var
t=i.parent(),o=t.find(.minicolors-panel),s=i.data(minicolors-settings);!i.data(minicolors-initialized)||i.prop(disabled)||t.hasClass(minicolors-inline)||t.hasClass(minicolors-focus)||(n(),t.addClass(minicolors-focus),o.stop(!0,!0).fadeIn(s.showSpeed,function(){s.shows.show.call(i.get(0))}))}function
n(){$(.minicolors-focus).each(function(){var
i=$(this),t=i.find(.minicolors-input),o=i.find(.minicolors-panel),n=t.data(minicolors-settings);o.fadeOut(n.hid
eSpeed,function(){n.hiden.hide.call(t.get(0)),i.removeClass(minicolors-focus)})})}function
s(i,t,o){var
n=i.parents(.minicolors).find(.minicolors-input),s=n.data(minicolors-settings),e=i.find([class$=-picker]),r=i.offset().left,c=i.offset().top,l=Math.round(t.pageX-r),h=Math.round(t.pageY-c),d=o?s.animationSpeed:0,u,g,m,p;t.originalEvent.changedTouches(l=t.originalEvent.changedTouches[0].pageX-r,h=t.originalEvent.changedTouches[0].pageY-c),0l(l=0),0h(h=0),li.width()(l=i.width()),hi.height()(h=i.height()),i.parent().is(.minicolors-slider-wheel)e.parent().is(.minicolors-grid)(u=75-l,g=75-h,m=Math.sqrt(u*u+g*g),p=Math.atan2(g,u),0p(p+=2*Math.PI),m75(m=75,l=75-75*Math.cos(p),h=75-75*Math.sin(p)),l=Math.round(l),h=Math.round(h)),i.is(.minicolors-grid)?e.stop(!0).animate({top:h+px,left:l+px},d,s.animationEasing,function(){a(n,i)}):e.stop(!0).animate({top:h+px},d,s.animationEasing,function(){a(n,i)})}function
a(i,t){function o(i,t){var o,n;re
turn
i.lengtht?(o=i.offset().left,n=i.offset().top,{x:o-t.offset().left+i.outerWidth()/2,y:n-t.offset().top+i.outerHeight()/2}):null}var
n,s,a,e,c,l,d,g=i.val(),m=i.attr(data-opacity),f=i.parent(),v=i.data(minicolors-settings),b=f.find(.minicolors-swatch),y=f.find(.minicolors-grid),M=f.find(.minicolors-slider),w=f.find(.minicolors-opacity-slider),x=y.find([class$=-picker]),C=M.find([class$=-picker]),k=w.find([class$=-picker]),S=o(x,y),z=o(C,M),D=o(k,w);if(t.is(.minicolors-grid,
[21/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
NIFI-27: - Latest version of codemirror. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1d23e6e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1d23e6e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1d23e6e1 Branch: refs/heads/NIFI-169 Commit: 1d23e6e13625a6ce4ae40b71c06d9ae42d771b48 Parents: 8a0e2ce Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 12:56:04 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 14:36:44 2014 -0500 -- .../src/main/webapp/WEB-INF/pages/canvas.jsp|4 +- .../src/main/webapp/js/codemirror/LICENSE | 38 +- .../js/codemirror/addon/edit/matchbrackets.js | 125 - .../js/codemirror/addon/hint/show-hint.css | 54 +- .../js/codemirror/addon/hint/show-hint.js | 411 - .../js/codemirror/lib/codemirror-compressed.js | 16 + .../webapp/js/codemirror/lib/codemirror.css | 282 +- .../main/webapp/js/codemirror/lib/codemirror.js | 8488 -- 8 files changed, 228 insertions(+), 9190 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index 09c8207..a40b745 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -33,9 +33,7 @@ link rel=stylesheet href=js/jquery/minicolors/jquery.minicolors.css type=text/css / link rel=stylesheet href=js/jquery/slickgrid/css/slick.grid.css type=text/css / link rel=stylesheet href=js/jquery/slickgrid/css/slick-default-theme.css type=text/css / -script type=text/javascript src=js/codemirror/lib/codemirror.js/script -script type=text/javascript src=js/codemirror/addon/edit/matchbrackets.js/script -script type=text/javascript src=js/codemirror/addon/hint/show-hint.js/script +script type=text/javascript src=js/codemirror/lib/codemirror-compressed.js/script script type=text/javascript src=js/jquery/jquery-1.7.min.js/script script type=text/javascript src=js/jquery/jquery-ui-1.8.10.custom.min.js/script script type=text/javascript src=js/jquery/jquery.center.js/script http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE old mode 100755 new mode 100644 index 4f1e9d1..d21bbea --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/LICENSE @@ -1,19 +1,19 @@ -Copyright (C) 2013 by Marijn Haverbeke mari...@gmail.com and others - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the Software), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Copyright (C) 2014 by Marijn Haverbeke mari...@gmail.com and others + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the Software), to deal +in the Software without restriction, including without limitation the rights +to use,
[07/51] [abbrv] incubator-nifi git commit: Merge branch 'nifi-27' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into nifi-27
Merge branch 'nifi-27' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into nifi-27 Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2f2474ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2f2474ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2f2474ef Branch: refs/heads/NIFI-169 Commit: 2f2474efbc20f07a5ee2ce10ce48954f4854146e Parents: 9180b7d fef8071 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 12:58:18 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 12:58:18 2014 -0500 -- --
[05/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9180b7d4/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
new file mode 100644
index 000..11b3fbc
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
@@ -0,0 +1,16 @@
+/* CodeMirror - Minified Bundled
+ Generated on 12/10/2014 with http://codemirror.net/doc/compress.html
+ Version: 4.8
+
+ CodeMirror Library:
+ - codemirror.js
+ Add-ons:
+ - matchbrackets.js
+ - show-hint.js
+ */
+
+!function(a){if(object==typeof exportsobject==typeof
module)module.exports=a();else{if(function==typeof definedefine.amd)return
define([],a);this.CodeMirror=a()}}(function(){use strict;function
w(a,b){if(!(this instanceof w))return new
w(a,b);this.options=b=b?Qg(b):{},Qg(ie,b,!1),J(b);var
c=b.value;string==typeof c(c=new Lf(c,b.mode)),this.doc=c;var
f=this.display=new
x(a,c);f.wrapper.CodeMirror=this,F(this),D(this),b.lineWrapping(this.display.wrapper.className+=
CodeMirror-wrap),b.autofocus!o_c(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new
Gg,keySeq:null},d11esetTimeout(Rg($c,this,!0),20),cd(this),ih(),Ac(this),this.curOp.forceUpdate=!0,Pf(this,c),b.autofocus!o||bh()==f.input?setTimeout(Rg(Hd,this),20):Id(this);for(var
g in je)je.hasOwnProperty(g)je[g](this,b[g],le);P(this);for(var
h=0;hpe.length;++h)pe[h](this);Cc(this)}function x(a,b){var c
=this,g=c.input=Yg(textarea,null,null,position: absolute; padding: 0;
width: 1px; height: 1em; outline:
none);f?g.style.width=1000px:g.setAttribute(wrap,off),n(g.style.border=1px
solid
black),g.setAttribute(autocorrect,off),g.setAttribute(autocapitalize,off),g.setAttribute(spellcheck,false),c.inputDiv=Yg(div,[g],null,overflow:
hidden; position: relative; width: 3px; height:
0px;),c.scrollbarH=Yg(div,[Yg(div,null,null,height: 100%; min-height:
1px)],CodeMirror-hscrollbar),c.scrollbarV=Yg(div,[Yg(div,null,null,min-width:
1px)],CodeMirror-vscrollbar),c.scrollbarFiller=Yg(div,null,CodeMirror-scrollbar-filler),c.gutterFiller=Yg(div,null,CodeMirror-gutter-filler),c.lineDiv=Yg(div,null,CodeMirror-code),c.selectionDiv=Yg(div,null,null,position:
relative; z-index:
1),c.cursorDiv=Yg(div,null,CodeMirror-cursors),c.measure=Yg(div,null,CodeMirror-measure),c.lineMeasure=Yg(div,null,CodeMirror-measure),c.lineSpace=Yg(div,[
c.measure,c.lineMeasure,c.selectionDiv,c.cursorDiv,c.lineDiv],null,position:
relative; outline:
none),c.mover=Yg(div,[Yg(div,[c.lineSpace],CodeMirror-lines)],null,position:
relative),c.sizer=Yg(div,[c.mover],CodeMirror-sizer),c.heightForcer=Yg(div,null,null,position:
absolute; height: +Bg+px; width:
1px;),c.gutters=Yg(div,null,CodeMirror-gutters),c.lineGutter=null,c.scroller=Yg(div,[c.sizer,c.heightForcer,c.gutters],CodeMirror-scroll),c.scroller.setAttribute(tabIndex,-1),c.wrapper=Yg(div,[c.inputDiv,c.scrollbarH,c.scrollbarV,c.scrollbarFiller,c.gutterFiller,c.scroller],CodeMirror),d8e(c.gutters.style.zIndex=-1,c.scroller.style.paddingRight=0),n(g.style.width=0px),f||(c.scroller.draggable=!0),k(c.inputDiv.style.height=1px,c.inputDiv.style.position=absolute),d8e(c.scrollbarH.style.minHeight=c.scrollbarV.style.minWidth=18px),a(a.appendChild?a.appendChild(c.wrapper):a(c.wrapper)),c.viewFrom=c.viewTo=b.first,c.view=[],c.external
Measured=null,c.viewOffset=0,c.lastWrapHeight=c.lastWrapWidth=0,c.updateLineNumbers=null,c.lineNumWidth=c.lineNumInnerWidth=c.lineNumChars=null,c.prevInput=,c.alignWidgets=!1,c.pollingFast=!1,c.poll=new
Gg,c.cachedCharWidth=c.cachedTextHeight=c.cachedPaddingH=null,c.inaccurateSelection=!1,c.maxLine=null,c.maxLineLength=0,c.maxLineChanged=!1,c.wheelDX=c.wheelDY=c.wheelStartX=c.wheelStartY=null,c.shift=!1,c.selForContextMenu=null}function
y(a){a.doc.mode=w.getMode(a.options,a.doc.modeOption),z(a)}function
z(a){a.doc.iter(function(a){a.stateAfter(a.stateAfter=null),a.styles(a.styles=null)}),a.doc.frontier=a.doc.first,Tb(a,100),a.state.modeGen++,a.curOpPc(a)}function
A(a){a.options.lineWrapping?(eh(a.display.wrapper,CodeMirror-wrap),a.display.sizer.style.minWidth=):(dh(a.display.wrapper,CodeMirror-wrap),I(a)),C(a),Pc(a),kc(a),setTimeout(function(){M(a)},100)}function
B(a){var
b=wc(a.display),c=a.options.lineWrapping,d=cMath.max(5,a.display.scroller.clientWidth/xc(a.displ
ay)-3);return function(e){if(ef(a.doc,e))return 0;var f=0;if(e.widgets)for(var
g=0;ge.widgets.length;g++)e.widgets[g].height(f+=e.widgets[g].height);return
c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function C(a){var
[42/51] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restoring line returns between public methods. - Upgrading jquery.form and jquery.minicolors. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2965258e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2965258e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2965258e Branch: refs/heads/NIFI-169 Commit: 2965258e5da192b8a54dc36f84089be90bc0f1f7 Parents: fc78752 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 08:42:13 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 08:42:13 2014 -0500 -- .../webapp/WEB-INF/pages/bulletin-board.jsp | 3 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp| 3 +- .../src/main/webapp/WEB-INF/pages/cluster.jsp | 1 - .../src/main/webapp/WEB-INF/pages/counters.jsp | 1 - .../src/main/webapp/WEB-INF/pages/history.jsp | 1 - .../main/webapp/WEB-INF/pages/provenance.jsp| 1 - .../src/main/webapp/WEB-INF/pages/summary.jsp | 1 - .../src/main/webapp/WEB-INF/pages/templates.jsp | 3 +- .../src/main/webapp/WEB-INF/pages/users.jsp | 1 - .../src/main/webapp/js/jquery/jquery.form.js| 1118 -- .../main/webapp/js/jquery/jquery.form.min.js|11 + .../js/jquery/minicolors/jquery.minicolors.css |40 +- .../jquery/minicolors/jquery.minicolors.min.js | 421 +- .../jquery/ui-smoothness/jquery-ui-1.10.4.css | 1178 -- .../js/jquery/ui-smoothness/jquery-ui-1.10.4.js | 15008 - .../js/nf/bulletin-board/nf-bulletin-board.js |16 +- .../src/main/webapp/js/nf/canvas/nf-actions.js |65 +- .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 1 + .../webapp/js/nf/canvas/nf-canvas-header.js |12 +- .../webapp/js/nf/canvas/nf-canvas-toolbar.js| 1 + .../webapp/js/nf/canvas/nf-canvas-toolbox.js|45 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js |73 +- .../src/main/webapp/js/nf/canvas/nf-canvas.js |59 +- .../main/webapp/js/nf/canvas/nf-clipboard.js| 4 + .../main/webapp/js/nf/canvas/nf-connectable.js | 1 + .../js/nf/canvas/nf-connection-configuration.js |43 +- .../main/webapp/js/nf/canvas/nf-connection.js |20 +- .../main/webapp/js/nf/canvas/nf-context-menu.js | 2 + .../main/webapp/js/nf/canvas/nf-draggable.js| 9 +- .../src/main/webapp/js/nf/canvas/nf-funnel.js | 8 + .../src/main/webapp/js/nf/canvas/nf-go-to.js|50 +- .../src/main/webapp/js/nf/canvas/nf-graph.js| 6 + .../js/nf/canvas/nf-label-configuration.js | 5 +- .../src/main/webapp/js/nf/canvas/nf-label.js|14 +- .../js/nf/canvas/nf-port-configuration.js | 5 +- .../main/webapp/js/nf/canvas/nf-port-details.js | 1 + .../src/main/webapp/js/nf/canvas/nf-port.js |10 + .../nf/canvas/nf-process-group-configuration.js | 5 +- .../js/nf/canvas/nf-process-group-details.js| 1 + .../webapp/js/nf/canvas/nf-process-group.js |10 + .../js/nf/canvas/nf-processor-configuration.js |13 +- .../js/nf/canvas/nf-processor-property-table.js |14 + .../main/webapp/js/nf/canvas/nf-processor.js|11 + .../main/webapp/js/nf/canvas/nf-registration.js | 4 +- .../nf-remote-process-group-configuration.js| 5 +- .../canvas/nf-remote-process-group-details.js | 1 + .../nf/canvas/nf-remote-process-group-ports.js |13 +- .../js/nf/canvas/nf-remote-process-group.js |10 + .../nf/canvas/nf-secure-port-configuration.js | 5 +- .../js/nf/canvas/nf-secure-port-details.js | 1 + .../main/webapp/js/nf/canvas/nf-selectable.js | 2 + .../src/main/webapp/js/nf/canvas/nf-settings.js |13 +- .../src/main/webapp/js/nf/canvas/nf-snippet.js | 6 + .../src/main/webapp/js/nf/canvas/nf-storage.js | 3 + .../webapp/js/nf/cluster/nf-cluster-table.js|31 +- .../src/main/webapp/js/nf/cluster/nf-cluster.js |12 +- .../webapp/js/nf/counters/nf-counters-table.js |11 +- .../main/webapp/js/nf/counters/nf-counters.js |12 +- .../webapp/js/nf/history/nf-history-model.js| 4 +- .../webapp/js/nf/history/nf-history-table.js| 7 +- .../src/main/webapp/js/nf/history/nf-history.js |12 +- .../src/main/webapp/js/nf/nf-common.js |40 + .../main/webapp/js/nf/nf-connection-details.js |19 +- .../src/main/webapp/js/nf/nf-dialog.js | 1 + .../main/webapp/js/nf/nf-processor-details.js | 5 +- .../src/main/webapp/js/nf/nf-shell.js | 1 + .../src/main/webapp/js/nf/nf-status-history.js |40 +- .../js/nf/provenance/nf-provenance-lineage.js |17 +- .../js/nf/provenance/nf-provenance-table.js |
[20/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
new file mode 100644
index 000..11b3fbc
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror-compressed.js
@@ -0,0 +1,16 @@
+/* CodeMirror - Minified Bundled
+ Generated on 12/10/2014 with http://codemirror.net/doc/compress.html
+ Version: 4.8
+
+ CodeMirror Library:
+ - codemirror.js
+ Add-ons:
+ - matchbrackets.js
+ - show-hint.js
+ */
+
+!function(a){if(object==typeof exportsobject==typeof
module)module.exports=a();else{if(function==typeof definedefine.amd)return
define([],a);this.CodeMirror=a()}}(function(){use strict;function
w(a,b){if(!(this instanceof w))return new
w(a,b);this.options=b=b?Qg(b):{},Qg(ie,b,!1),J(b);var
c=b.value;string==typeof c(c=new Lf(c,b.mode)),this.doc=c;var
f=this.display=new
x(a,c);f.wrapper.CodeMirror=this,F(this),D(this),b.lineWrapping(this.display.wrapper.className+=
CodeMirror-wrap),b.autofocus!o_c(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,draggingText:!1,highlight:new
Gg,keySeq:null},d11esetTimeout(Rg($c,this,!0),20),cd(this),ih(),Ac(this),this.curOp.forceUpdate=!0,Pf(this,c),b.autofocus!o||bh()==f.input?setTimeout(Rg(Hd,this),20):Id(this);for(var
g in je)je.hasOwnProperty(g)je[g](this,b[g],le);P(this);for(var
h=0;hpe.length;++h)pe[h](this);Cc(this)}function x(a,b){var c
=this,g=c.input=Yg(textarea,null,null,position: absolute; padding: 0;
width: 1px; height: 1em; outline:
none);f?g.style.width=1000px:g.setAttribute(wrap,off),n(g.style.border=1px
solid
black),g.setAttribute(autocorrect,off),g.setAttribute(autocapitalize,off),g.setAttribute(spellcheck,false),c.inputDiv=Yg(div,[g],null,overflow:
hidden; position: relative; width: 3px; height:
0px;),c.scrollbarH=Yg(div,[Yg(div,null,null,height: 100%; min-height:
1px)],CodeMirror-hscrollbar),c.scrollbarV=Yg(div,[Yg(div,null,null,min-width:
1px)],CodeMirror-vscrollbar),c.scrollbarFiller=Yg(div,null,CodeMirror-scrollbar-filler),c.gutterFiller=Yg(div,null,CodeMirror-gutter-filler),c.lineDiv=Yg(div,null,CodeMirror-code),c.selectionDiv=Yg(div,null,null,position:
relative; z-index:
1),c.cursorDiv=Yg(div,null,CodeMirror-cursors),c.measure=Yg(div,null,CodeMirror-measure),c.lineMeasure=Yg(div,null,CodeMirror-measure),c.lineSpace=Yg(div,[
c.measure,c.lineMeasure,c.selectionDiv,c.cursorDiv,c.lineDiv],null,position:
relative; outline:
none),c.mover=Yg(div,[Yg(div,[c.lineSpace],CodeMirror-lines)],null,position:
relative),c.sizer=Yg(div,[c.mover],CodeMirror-sizer),c.heightForcer=Yg(div,null,null,position:
absolute; height: +Bg+px; width:
1px;),c.gutters=Yg(div,null,CodeMirror-gutters),c.lineGutter=null,c.scroller=Yg(div,[c.sizer,c.heightForcer,c.gutters],CodeMirror-scroll),c.scroller.setAttribute(tabIndex,-1),c.wrapper=Yg(div,[c.inputDiv,c.scrollbarH,c.scrollbarV,c.scrollbarFiller,c.gutterFiller,c.scroller],CodeMirror),d8e(c.gutters.style.zIndex=-1,c.scroller.style.paddingRight=0),n(g.style.width=0px),f||(c.scroller.draggable=!0),k(c.inputDiv.style.height=1px,c.inputDiv.style.position=absolute),d8e(c.scrollbarH.style.minHeight=c.scrollbarV.style.minWidth=18px),a(a.appendChild?a.appendChild(c.wrapper):a(c.wrapper)),c.viewFrom=c.viewTo=b.first,c.view=[],c.external
Measured=null,c.viewOffset=0,c.lastWrapHeight=c.lastWrapWidth=0,c.updateLineNumbers=null,c.lineNumWidth=c.lineNumInnerWidth=c.lineNumChars=null,c.prevInput=,c.alignWidgets=!1,c.pollingFast=!1,c.poll=new
Gg,c.cachedCharWidth=c.cachedTextHeight=c.cachedPaddingH=null,c.inaccurateSelection=!1,c.maxLine=null,c.maxLineLength=0,c.maxLineChanged=!1,c.wheelDX=c.wheelDY=c.wheelStartX=c.wheelStartY=null,c.shift=!1,c.selForContextMenu=null}function
y(a){a.doc.mode=w.getMode(a.options,a.doc.modeOption),z(a)}function
z(a){a.doc.iter(function(a){a.stateAfter(a.stateAfter=null),a.styles(a.styles=null)}),a.doc.frontier=a.doc.first,Tb(a,100),a.state.modeGen++,a.curOpPc(a)}function
A(a){a.options.lineWrapping?(eh(a.display.wrapper,CodeMirror-wrap),a.display.sizer.style.minWidth=):(dh(a.display.wrapper,CodeMirror-wrap),I(a)),C(a),Pc(a),kc(a),setTimeout(function(){M(a)},100)}function
B(a){var
b=wc(a.display),c=a.options.lineWrapping,d=cMath.max(5,a.display.scroller.clientWidth/xc(a.displ
ay)-3);return function(e){if(ef(a.doc,e))return 0;var f=0;if(e.widgets)for(var
g=0;ge.widgets.length;g++)e.widgets[g].height(f+=e.widgets[g].height);return
c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function C(a){var
[33/51] [abbrv] incubator-nifi git commit: NIFI-27: - Updating cluster search to work with upgraded jquery ui. - Better support for case when no results are found.
NIFI-27:
- Updating cluster search to work with upgraded jquery ui.
- Better support for case when no results are found.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/68e08983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/68e08983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/68e08983
Branch: refs/heads/NIFI-169
Commit: 68e0898399f7a8165fc35fb31157db9763519382
Parents: 71e53ae
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Fri Dec 12 10:34:56 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Fri Dec 12 10:34:56 2014 -0500
--
.../summary/view-single-node-dialog.jsp | 1 +
.../nifi-web-ui/src/main/webapp/css/summary.css | 11 +++-
.../webapp/js/nf/summary/nf-cluster-search.js | 29 +++-
3 files changed, 33 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/68e08983/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
index 9570de5..4a3338c 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
@@ -21,3 +21,4 @@
div id=cluster-search-example(e.g.nbsp;my.host:80)/div
/div
/div
+div id=search-cluster-results/div
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/68e08983/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
index cab21c0..c109927 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/summary.css
@@ -139,9 +139,18 @@ div.search-match {
font-size: 10px;
}
-.ui-autocomplete {
+#search-cluster-results .ui-autocomplete {
max-height: 300px;
overflow: auto;
+border: 1px solid #aa;
+z-index: 1351;
+border-radius: 0;
+}
+
+#search-cluster-results .ui-menu .ui-menu-item a.ui-state-focus {
+background: #D4E0E5 !important;
+border: 1px solid #99;
+border-radius: 0;
}
input.search-nodes {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/68e08983/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
index 035e6f0..2254943 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
@@ -102,13 +102,27 @@ nf.ClusterSearch = (function () {
// configure the cluster auto complete
$.widget('nf.clusterSearchAutocomplete', $.ui.autocomplete, {
-_normalize: function (content) {
-return $.map(content, function (item, i) {
-return $.extend({
-label: item.address,
-value: item.address
-}, item);
+_normalize: function(searchResults) {
+var items = [];
+items.push(searchResults);
+return items;
+},
+_renderMenu: function(ul, items) {
+// results are normalized into a single element array
+var searchResults = items[0];
+
+var self = this;
+$.each(searchResults.nodeResults, function(_, node) {
+self._renderItemData(ul, {
+label: node.address,
+value: node.address
+
[47/51] [abbrv] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a016bf47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a016bf47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a016bf47 Branch: refs/heads/NIFI-169 Commit: a016bf47bdb778fd436544bd445c1c031aeefb7b Parents: f10bb3c Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 11:12:15 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 11:12:15 2014 -0500 -- .../js/jquery/minicolors/jquery.minicolors.css | 284 +-- .../jquery/minicolors/jquery.minicolors.min.js | 8 +- 2 files changed, 140 insertions(+), 152 deletions(-) --
[37/51] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
index 443..ddc501a 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-go-to.js
@@ -336,6 +336,7 @@ nf.GoTo = (function () {
}
});
},
+
/**
* Shows components downstream from a processor.
*
@@ -348,7 +349,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -372,8 +373,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components upstream from a processor.
*
@@ -386,7 +388,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the upstream dialog
@@ -410,8 +412,9 @@ nf.GoTo = (function () {
// show the upstream dialog
$('#connections-dialog').modal('setHeaderText', 'Upstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components downstream from a process group or a remote
process group.
*
@@ -424,7 +427,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -448,8 +451,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components upstream from a process group or a remote process
group.
*
@@ -462,7 +466,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the upstream dialog
@@ -486,8 +490,9 @@ nf.GoTo = (function () {
// show the dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-}, nf.Common.handleAjaxError);
+}).fail(nf.Common.handleAjaxError);
},
+
/**
* Shows components downstream from an input port.
*
@@ -500,7 +505,7 @@ nf.GoTo = (function () {
type: 'GET',
url: config.urls.controller + '/process-groups/' +
encodeURIComponent(selectionData.component.parentGroupId) + '/connections',
dataType: 'json'
-}).then(function (response) {
+}).done(function (response) {
var connections = response.connections;
// populate the downstream dialog
@@ -524,8 +529,9 @@ nf.GoTo = (function () {
// show the downstream dialog
$('#connections-dialog').modal('setHeaderText', 'Downstream
Connections').modal('show');
-},
[18/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of codemirror.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1d23e6e1/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
deleted file mode 100755
index a085720..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1,8488 +0,0 @@
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function (mod) {
-if (typeof exports == object typeof module == object) // CommonJS
-module.exports = mod();
-else if (typeof define == function define.amd) // AMD
-return define([], mod);
-else // Plain browser env
-this.CodeMirror = mod();
-})(function () {
-use strict;
-
-// BROWSER SNIFFING
-
-// Kludges for bugs and behavior differences that can't be feature
-// detected are enabled based on userAgent etc sniffing.
-
-var gecko = /gecko\/\d/i.test(navigator.userAgent);
-// ie_uptoN means Internet Explorer version N or lower
-var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-var ie_upto7 = ie_upto10 (document.documentMode == null ||
document.documentMode 8);
-var ie_upto8 = ie_upto10 (document.documentMode == null ||
document.documentMode 9);
-var ie_upto9 = ie_upto10 (document.documentMode == null ||
document.documentMode 10);
-var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
-var ie = ie_upto10 || ie_11up;
-var webkit = /WebKit\//.test(navigator.userAgent);
-var qtwebkit = webkit /Qt\/\d+\.\d+/.test(navigator.userAgent);
-var chrome = /Chrome\//.test(navigator.userAgent);
-var presto = /Opera\//.test(navigator.userAgent);
-var safari = /Apple Computer/.test(navigator.vendor);
-var khtml = /KHTML\//.test(navigator.userAgent);
-var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent);
-var mac_geMountainLion = /Mac OS X
1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-var phantom = /PhantomJS/.test(navigator.userAgent);
-
-var ios = /AppleWebKit/.test(navigator.userAgent)
/Mobile\/\w+/.test(navigator.userAgent);
-// This is woefully incomplete. Suggestions for alternative methods
welcome.
-var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera
Mobi|IEMobile/i.test(navigator.userAgent);
-var mac = ios || /Mac/.test(navigator.platform);
-var windows = /win/i.test(navigator.platform);
-
-var presto_version = presto
navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-if (presto_version)
-presto_version = Number(presto_version[1]);
-if (presto_version presto_version = 15) {
-presto = false;
-webkit = true;
-}
-// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-var flipCtrlCmd = mac (qtwebkit || presto (presto_version == null ||
presto_version 12.11));
-var captureRightClick = gecko || (ie !ie_upto8);
-
-// Optimize some code when these features are not used.
-var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-// EDITOR CONSTRUCTOR
-
-// A CodeMirror instance represents an editor. This is the object
-// that user code is usually dealing with.
-
-function CodeMirror(place, options) {
-if (!(this instanceof CodeMirror))
-return new CodeMirror(place, options);
-
-this.options = options = options || {};
-// Determine effective options based on given values and defaults.
-for (var opt in defaults)
-if (!options.hasOwnProperty(opt))
-options[opt] = defaults[opt];
-setGuttersForLineNumbers(options);
-
-var doc = options.value;
-if (typeof doc == string)
-doc = new Doc(doc, options.mode);
-this.doc = doc;
-
-var display = this.display = new Display(place, doc);
-display.wrapper.CodeMirror = this;
-updateGutters(this);
-themeChanged(this);
-if (options.lineWrapping)
-this.display.wrapper.className += CodeMirror-wrap;
-if (options.autofocus !mobile)
-focusInput(this);
-
-this.state = {
-keyMaps: [], // stores maps added by addKeyMap
-overlays: [], // highlighting overlays, as added by addOverlay
-modeGen: 0, // bumped when mode/overlay changes, used to
invalidate highlighting info
-overwrite: false, focused: false,
-suppressEdits: false, // used to
[46/51] [abbrv] incubator-nifi git commit: NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a016bf47/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
index 91363b8..cdf4ae4 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
@@ -1,269 +1,259 @@
.minicolors {
-position: relative;
-}
-
-.minicolors-sprite {
-background-image:
url(data:image/png;base64,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
[10/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
index b4a2d7d..c12bae9 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.grid.js
@@ -1,2832 +1,3422 @@
-/**
- * @license
- * (c) 2009-2012 Michael Leibman
- * michael{dot}leibman{at}gmail{dot}com
- * http://github.com/mleibman/slickgrid
- *
- * Distributed under MIT license.
- * All rights reserved.
- *
- * SlickGrid v2.0
- *
- * NOTES:
- * Cell/row DOM manipulations are done directly bypassing jQuery's DOM
manipulation methods.
- * This increases the speed dramatically, but can only be done safely
because there are no event handlers
- * or data associated with any cell/row DOM nodes. Cell editors must make
sure they implement .destroy()
- * and do proper cleanup.
- */
-
-// make sure required JavaScript modules are loaded
-if (typeof jQuery === undefined) {
-throw SlickGrid requires jquery module to be loaded;
-}
-if (!jQuery.fn.drag) {
-throw SlickGrid requires jquery.event.drag module to be loaded;
-}
-if (typeof Slick === undefined) {
-throw slick.core.js not loaded;
-}
-
-
-(function ($) {
-// Slick.Grid
-$.extend(true, window, {
-Slick: {
-Grid: SlickGrid
-}
-});
-
-// shared across all grids on the page
-var scrollbarDimensions;
-var maxSupportedCssHeight; // browser's breaking point
-
-
//
-// SlickGrid class implementation (available as Slick.Grid)
-
-/**
- * Creates a new instance of the grid.
- * @class SlickGrid
- * @constructor
- * @param {Node} container Container node to create the
grid in.
- * @param {Array,Object} dataAn array of objects for
databinding.
- * @param {Array} columns An array of column definitions.
- * @param {Object}options Grid options.
- **/
-function SlickGrid(container, data, columns, options) {
-// settings
-var defaults = {
-explicitInitialization: false,
-rowHeight: 25,
-defaultColumnWidth: 80,
-enableAddRow: false,
-leaveSpaceForNewRows: false,
-editable: false,
-autoEdit: true,
-enableCellNavigation: true,
-enableColumnReorder: true,
-asyncEditorLoading: false,
-asyncEditorLoadDelay: 100,
-forceFitColumns: false,
-enableAsyncPostRender: false,
-asyncPostRenderDelay: 60,
-autoHeight: false,
-editorLock: Slick.GlobalEditorLock,
-showHeaderRow: false,
-headerRowHeight: 25,
-showTopPanel: false,
-topPanelHeight: 25,
-formatterFactory: null,
-editorFactory: null,
-cellFlashingCssClass: flashing,
-selectedCellCssClass: selected,
-multiSelect: true,
-enableTextSelectionOnCells: false,
-dataItemColumnValueExtractor: null,
-fullWidthRows: false,
-multiColumnSort: false,
-defaultFormatter: defaultFormatter
-};
-
-var columnDefaults = {
-name: ,
-resizable: true,
-sortable: false,
-minWidth: 30,
-rerenderOnResize: false,
-headerCssClass: null
-};
-
-// scroller
-var th; // virtual height
-var h;// real scrollable height
-var ph; // page height
-var n;// number of pages
-var cj; // jumpiness coefficient
-
-var page = 0; // current page
-var offset = 0; // current page offset
-var scrollDir = 1;
-
-// private
-var initialized = false;
-var $container;
-var uid = slickgrid_ + Math.round(100 * Math.random());
-var self = this;
-var $focusSink;
-var $headerScroller;
-var $headers;
-var $headerRow, $headerRowScroller;
-var $topPanelScroller;
-var $topPanel;
-var $viewport;
-var $canvas;
-var $style;
-var stylesheet, columnCssRulesL, columnCssRulesR;
-var viewportH, viewportW;
-var canvasWidth;
-var viewportHasHScroll, viewportHasVScroll;
-var
[14/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
NIFI-27:
- Latest version of slickgrid.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4c959f72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4c959f72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4c959f72
Branch: refs/heads/NIFI-169
Commit: 4c959f72988d13dc2ff54d38eb9efc4682d5b901
Parents: 658131d
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Wed Dec 10 10:12:43 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Wed Dec 10 14:36:34 2014 -0500
--
.../src/main/webapp/WEB-INF/pages/canvas.jsp|2 +-
.../src/main/webapp/WEB-INF/pages/cluster.jsp |2 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp |2 +-
.../src/main/webapp/WEB-INF/pages/history.jsp |2 +-
.../main/webapp/WEB-INF/pages/provenance.jsp|2 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp |2 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp |2 +-
.../src/main/webapp/WEB-INF/pages/users.jsp |2 +-
.../js/jquery/jquery.event.drag-2.0.min.js | 194 -
.../js/jquery/jquery.event.drag-2.2.min.js |6 +
.../webapp/js/jquery/slickgrid/MIT-LICENSE.txt | 20 +
.../js/jquery/slickgrid/css/images/collapse.gif | Bin 0 - 846 bytes
.../js/jquery/slickgrid/css/images/expand.gif | Bin 0 - 851 bytes
.../slickgrid/css/slick-default-theme.css | 68 +-
.../js/jquery/slickgrid/css/slick.grid.css | 173 +-
.../slickgrid/plugins/slick.autotooltips.js | 121 +-
.../plugins/slick.cellrangedecorator.js | 110 +-
.../plugins/slick.cellrangeselector.js | 194 +-
.../plugins/slick.cellselectionmodel.js | 210 +-
.../plugins/slick.rowselectionmodel.js | 325 +-
.../webapp/js/jquery/slickgrid/slick.core.js| 796 +--
.../js/jquery/slickgrid/slick.dataview.js | 1920 +++---
.../webapp/js/jquery/slickgrid/slick.editors.js | 994 +--
.../js/jquery/slickgrid/slick.formatters.js | 86 +-
.../webapp/js/jquery/slickgrid/slick.grid.js| 6254 ++
25 files changed, 6144 insertions(+), 5343 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index c8f2ff7..09c8207 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -48,7 +48,7 @@
script type=text/javascript
src=js/jquery/modal/jquery.modal.js?${project.version}/script
script type=text/javascript
src=js/jquery/minicolors/jquery.minicolors.min.js/script
script type=text/javascript
src=js/jquery/qtip2/jquery.qtip.min.js/script
-script type=text/javascript
src=js/jquery/jquery.event.drag-2.0.min.js/script
+script type=text/javascript
src=js/jquery/jquery.event.drag-2.2.min.js/script
script type=text/javascript
src=js/jquery/slickgrid/plugins/slick.cellrangeselector.js/script
script type=text/javascript
src=js/jquery/slickgrid/plugins/slick.cellselectionmodel.js/script
script type=text/javascript
src=js/jquery/slickgrid/plugins/slick.rowselectionmodel.js/script
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index e3e7b86..a0bda24 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
@@ -36,7 +36,7 @@
script type=text/javascript src=js/jquery/jquery.each.js/script
script type=text/javascript
src=js/jquery/jquery-ui-1.8.10.custom.min.js/script
script type=text/javascript
src=js/jquery/qtip2/jquery.qtip.min.js/script
-script type=text/javascript
src=js/jquery/jquery.event.drag-2.0.min.js/script
+script type=text/javascript
src=js/jquery/jquery.event.drag-2.2.min.js/script
script type=text/javascript
[24/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
new file mode 100755
index 000..df6064c
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.10.4 - 2014-12-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e,t){function i(t,i){var
n,a,o,r=t.nodeName.toLowerCase();returnarea===r?(n=t.parentNode,a=n.name,t.hrefamap===n.nodeName.toLowerCase()?(o=e(img[usemap=#+a+])[0],!!os(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:a===r?t.href||i:i)s(t)}function
s(t){return
e.expr.filters.visible(t)!e(t).parents().addBack().filter(function(){returnhidden===e.css(this,visibility)}).length}var
n=0,a=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:1.10.4,keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({focus:function(t){return
function(i,s){returnnumber==typeof i?this.each(function(){var
t=this;setTimeout(function(){e(t).focus(),ss.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),scrollParent:function(){var
t;
return
t=e.ui.ie/(static|relative)/.test(this.css(position))||/absolute/.test(this.css(position))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,position))/(auto|scroll)/.test(e.css(this,overflow)+e.css(this,overflow-y)+e.css(this,overflow-x))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,overflow)+e.css(this,overflow-y)+e.css(this,overflow-x))}).eq(0),/fixed/.test(this.css(position))||!t.length?e(document):t},zIndex:function(i){if(i!==t)return
this.css(zIndex,i);if(this.length)for(var
s,n,a=e(this[0]);a.lengtha[0]!==document;){if(s=a.css(position),(absolute===s||relative===s||fixed===s)(n=parseInt(a.css(zIndex),10),!isNaN(n)0!==n))return
n;a=a.parent()}return 0},uniqueId:function(){return
this.each(function(){this.id||(this.id=ui-id-+
++n)})},removeUniqueId:function(){return
this.each(function(){a.test(this.id)e(this).removeAttr(id)})}}),e.extend(e.expr[:],{data:e.
expr.createPseudo?e.expr.createPseudo(function(t){return
function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(t){return
i(t,!isNaN(e.attr(t,tabindex)))},tabbable:function(t){var
s=e.attr(t,tabindex),n=isNaN(s);return(n||s=0)i(t,!n)}}),e(a).outerWidth(1).jquery||e.each([Width,Height],function(i,s){function
n(t,i,s,n){return
e.each(a,function(){i-=parseFloat(e.css(t,padding+this))||0,s(i-=parseFloat(e.css(t,border+this+Width))||0),n(i-=parseFloat(e.css(t,margin+this))||0)}),i}var
a=Width===s?[Left,Right]:[Top,Bottom],o=s.toLowerCase(),r={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn[inner+s]=function(i){return
i===t?r[inner+s].call(this):this.each(function(){e(this).css(o,n(this,i)+px)})},e.fn[outer+s]=function(t,i){returnnumber!=typeof
t?r[outer+s].call(this,t):this.each(function(){e(this).css(o,n(this,t,!0,i)+px)})}}),e.f
n.addBack||(e.fn.addBack=function(e){return
this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e(a).data(a-b,a).removeData(a-b).data(a-b)(e.fn.removeData=function(t){return
function(i){return
arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie
[\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart=onselectstartin
[23/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
index a9d8d27..c1c4117 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
@@ -32,25 +32,15 @@ nf.Search = (function () {
reset: function () {
this.term = null;
},
-_response: function (content) {
-if (!this.options.disabled content) {
-this._suggest(content);
-this._trigger('open');
-} else {
-this.close();
-}
-this.pending--;
-if (!this.pending) {
-this.element.removeClass('ui-autocomplete-loading');
-}
-},
_resizeMenu: function () {
var ul = this.menu.element;
ul.width(399);
},
_renderMenu: function (ul, items) {
var self = this;
-var searchResults = items.searchResultsDTO;
+
+// the object that holds the search results is normalized
into a single element array
+var searchResults = items[0];
// show all processors
if (!nf.Common.isEmpty(searchResults.processorResults)) {
@@ -118,12 +108,13 @@ nf.Search = (function () {
$.each(match.matches, function (i, match) {
itemContent.append($('div
class=search-match/div').text(match));
});
-return $('li/li').data('item.autocomplete',
match).append(itemContent).appendTo(ul);
+return $('li/li').data('ui-autocomplete-item',
match).append(itemContent).appendTo(ul);
}
});
// configure the search field
$('#search-field').zIndex(1250).searchAutocomplete({
+appendTo: '#search-flow-results',
position: {
my: 'right top',
at: 'right bottom',
[02/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of qtip2.
NIFI-27:
- Latest version of qtip2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/57b4178f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/57b4178f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/57b4178f
Branch: refs/heads/NIFI-169
Commit: 57b4178f19960bb4359d79f462c6e790e3e8f1a1
Parents: f60a97b
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Wed Dec 10 08:35:31 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Wed Dec 10 12:19:26 2014 -0500
--
.../webapp/WEB-INF/pages/bulletin-board.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/cluster.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/history.jsp | 2 +-
.../main/webapp/WEB-INF/pages/provenance.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/users.jsp | 2 +-
.../main/webapp/js/jquery/qtip2/jquery.qtip.css | 557 ---
.../webapp/js/jquery/qtip2/jquery.qtip.min.css | 3 +
.../webapp/js/jquery/qtip2/jquery.qtip.min.js | 711 +--
12 files changed, 17 insertions(+), 1272 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
index 8669f6c..083862d 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
@@ -24,7 +24,7 @@
${nf.bulletin.board.style.tags}
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
script type=text/javascript
src=js/jquery/jquery-1.7.min.js/script
script type=text/javascript
src=js/jquery/jquery.center.js/script
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index acdd147..c8f2ff7 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -28,7 +28,7 @@
link rel=stylesheet
href=js/jquery/tabbs/jquery.tabbs.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
link rel=stylesheet
href=js/jquery/minicolors/jquery.minicolors.css type=text/css /
link rel=stylesheet href=js/jquery/slickgrid/css/slick.grid.css
type=text/css /
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/57b4178f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index 33fdbb0..e3e7b86 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++
[34/51] [abbrv] incubator-nifi git commit: NIFI-27: - Better result normalization. - Updated styles.
NIFI-27:
- Better result normalization.
- Updated styles.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d307a13c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d307a13c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d307a13c
Branch: refs/heads/NIFI-169
Commit: d307a13c5d4610dd3aa8bdeacab850725bedeb7d
Parents: 68e0898
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Fri Dec 12 10:37:02 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Fri Dec 12 10:37:02 2014 -0500
--
.../framework/web/nifi-web-ui/src/main/webapp/css/header.css | 1 +
.../web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js | 7 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
index 6b096a1..0f08b47 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/header.css
@@ -456,6 +456,7 @@ input.search-flow {
overflow: auto;
border: 1px solid #aa;
z-index: 1251;
+border-radius: 0;
}
#search-flow-results .ui-menu .ui-menu-item a.ui-state-focus {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d307a13c/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
index c1c4117..2016721 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js
@@ -36,6 +36,11 @@ nf.Search = (function () {
var ul = this.menu.element;
ul.width(399);
},
+_normalize: function(searchResults) {
+var items = [];
+items.push(searchResults);
+return items;
+},
_renderMenu: function (ul, items) {
var self = this;
@@ -130,7 +135,7 @@ nf.Search = (function () {
dataType: 'json',
url: config.urls.search
}).done(function (searchResponse) {
-response(searchResponse);
+response(searchResponse.searchResultsDTO);
});
},
select: function (event, ui) {
[12/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of slickgrid.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c959f72/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
index 07f5900..f1c1b5e 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/slick.dataview.js
@@ -1,914 +1,1126 @@
(function ($) {
-$.extend(true, window, {
-Slick: {
-Data: {
-DataView: DataView,
-Aggregators: {
-Avg: AvgAggregator,
-Min: MinAggregator,
-Max: MaxAggregator,
-Sum: SumAggregator
-}
-}
+ $.extend(true, window, {
+Slick: {
+ Data: {
+DataView: DataView,
+Aggregators: {
+ Avg: AvgAggregator,
+ Min: MinAggregator,
+ Max: MaxAggregator,
+ Sum: SumAggregator
}
-});
-
+ }
+}
+ });
+
+
+ /***
+ * A sample Model implementation.
+ * Provides a filtered view of the underlying data.
+ *
+ * Relies on the data item having an id property uniquely identifying it.
+ */
+ function DataView(options) {
+var self = this;
+
+var defaults = {
+ groupItemMetadataProvider: null,
+ inlineFilters: false
+};
+
+
+// private
+var idProperty = id; // property holding a unique row id
+var items = []; // data by index
+var rows = []; // data by row
+var idxById = {}; // indexes by id
+var rowsById = null;// rows by id; lazy-calculated
+var filter = null; // filter function
+var updated = null; // updated item ids
+var suspend = false;// suspends the recalculation
+var sortAsc = true;
+var fastSortField;
+var sortComparer;
+var refreshHints = {};
+var prevRefreshHints = {};
+var filterArgs;
+var filteredItems = [];
+var compiledFilter;
+var compiledFilterWithCaching;
+var filterCache = [];
+
+// grouping
+var groupingInfoDefaults = {
+ getter: null,
+ formatter: null,
+ comparer: function(a, b) { return a.value - b.value; },
+ predefinedValues: [],
+ aggregators: [],
+ aggregateEmpty: false,
+ aggregateCollapsed: false,
+ aggregateChildGroups: false,
+ collapsed: false,
+ displayTotalsRow: true,
+ lazyTotalsCalculation: false
+};
+var groupingInfos = [];
+var groups = [];
+var toggledGroupsByLevel = [];
+var groupingDelimiter = ':|:';
+
+var pagesize = 0;
+var pagenum = 0;
+var totalRows = 0;
+
+// events
+var onRowCountChanged = new Slick.Event();
+var onRowsChanged = new Slick.Event();
+var onPagingInfoChanged = new Slick.Event();
+
+options = $.extend(true, {}, defaults, options);
+
+
+function beginUpdate() {
+ suspend = true;
+}
+
+function endUpdate() {
+ suspend = false;
+ refresh();
+}
+
+function setRefreshHints(hints) {
+ refreshHints = hints;
+}
+
+function setFilterArgs(args) {
+ filterArgs = args;
+}
+
+function updateIdxById(startingIndex) {
+ startingIndex = startingIndex || 0;
+ var id;
+ for (var i = startingIndex, l = items.length; i l; i++) {
+id = items[i][idProperty];
+if (id === undefined) {
+ throw Each data element must implement a unique 'id' property;
+}
+idxById[id] = i;
+ }
+}
+
+function ensureIdUniqueness() {
+ var id;
+ for (var i = 0, l = items.length; i l; i++) {
+id = items[i][idProperty];
+if (id === undefined || idxById[id] !== i) {
+ throw Each data element must implement a unique 'id' property;
+}
+ }
+}
+
+function getItems() {
+ return items;
+}
+
+function setItems(data, objectIdProperty) {
+ if (objectIdProperty !== undefined) {
+idProperty = objectIdProperty;
+ }
+ items = filteredItems = data;
+ idxById = {};
+ updateIdxById();
+ ensureIdUniqueness();
+ refresh();
+}
+
+function setPagingOptions(args) {
+ if (args.pageSize != undefined) {
+pagesize = args.pageSize;
+pagenum = pagesize ? Math.min(pagenum, Math.max(0, Math.ceil(totalRows
/ pagesize) - 1)) : 0;
+ }
+
+ if (args.pageNum != undefined) {
+pagenum = Math.min(args.pageNum, Math.max(0, Math.ceil(totalRows /
pagesize) - 1));
+ }
+
+ onPagingInfoChanged.notify(getPagingInfo(),
[25/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
new file mode 100755
index 000..1aa929c
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.10.4 - 2014-12-11
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css,
jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css,
jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css,
jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css,
jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css,
jquery.ui.theme.css
+* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-seriffwDefault=normalfsDefault=1.1emcornerRadius=4pxbgColorHeader=ccbgTextureHeader=highlight_softbgImgOpacityHeader=75borderColorHeader=aafcHeader=22iconColorHeader=22bgColorContent=ffbgTextureContent=flatbgImgOpacityContent=75borderColorContent=aafcContent=22iconColorContent=22bgColorDefault=e6e6e6bgTextureDefault=glassbgImgOpacityDefault=75borderColorDefault=d3d3d3fcDefault=55iconColorDefault=88bgColorHover=dadadabgTextureHover=glassbgImgOpacityHover=75borderColorHover=99fcHover=212121iconColorHover=454545bgColorActive=ffbgTextureActive=glassbgImgOpacityActive=65borderColorActive=aafcActive=212121iconColorActive=454545bgColorHighlight=fbf9eebgTextureHighlight=glassbgImgOpacityHighlight=55borderColorHighlight=fcefa1fcHighlight=363636iconColorHighlight=2e83ffbgColorError=fef1ecbgTextureE
rror=glassbgImgOpacityError=95borderColorError=cd0a0afcError=cd0a0aiconColorError=cd0a0abgColorOverlay=aabgTextureOverlay=flatbgImgOpacityOverlay=0opacityOverlay=30bgColorShadow=aabgTextureShadow=flatbgImgOpacityShadow=0opacityShadow=30thicknessShadow=8pxoffsetTopShadow=-8pxoffsetLeftShadow=-8pxcornerRadiusShadow=8px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0
0 0
0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:;display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-9px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block}.ui-resizable-disabled
.ui-resizable-handle,.ui-resizable-autohide
.ui-resizable-handle{display:none}.ui-re
sizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px
dotted black}.ui-accordion
.ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em
.5em .5em .7em;min-height:0}.ui-accordion
.ui-accordion-icons{padding-left:2.2em}.ui-accordion
.ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons
.ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-acc
ordion-header
.ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion
.ui-accordion-content{padding:1em
[43/51] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Updating autocomplete as appropriate. - Restoring line returns between methods.
NIFI-27: - Upgrading jQuery and jQuery UI. - Updating autocomplete as appropriate. - Restoring line returns between methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/888d1baf Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/888d1baf Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/888d1baf Branch: refs/heads/NIFI-169 Commit: 888d1bafc784e6052b14c4e35f1e1c63c246f743 Parents: 2965258 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Tue Dec 16 09:40:56 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Tue Dec 16 09:40:56 2014 -0500 -- .../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 33 +- .../ui/src/main/webapp/css/main.css | 17 - .../ui/src/main/webapp/css/reset.css| 59 - .../ui/src/main/webapp/js/application.js| 67 ++-- 4 files changed, 80 insertions(+), 96 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/888d1baf/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp -- diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp index e882030..3c32299 100644 --- a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp +++ b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp @@ -19,17 +19,29 @@ html head meta http-equiv=Content-Type content=text/html; charset=UTF-8 -script type=text/javascript src=../nifi/js/jquery/jquery-1.7.min.js/script +link rel=stylesheet href=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/slickgrid/css/slick.grid.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/slickgrid/css/slick-default-theme.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/modal/jquery.modal.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/combo/jquery.combo.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/qtip2/jquery.qtip.min.css type=text/css / +link rel=stylesheet href=../nifi/js/codemirror/lib/codemirror.css type=text/css / +link rel=stylesheet href=../nifi/js/codemirror/addon/hint/show-hint.css type=text/css / +link rel=stylesheet href=../nifi/js/jquery/nfeditor/jquery.nfeditor.css type=text/css / +link rel=stylesheet href=../nifi/css/reset.css type=text/css / +link rel=stylesheet href=css/main.css type=text/css / +script type=text/javascript src=../nifi/js/jquery/jquery-2.1.1.min.js/script +script src=http://code.jquery.com/jquery-migrate-1.2.1.js;/script script type=text/javascript src=../nifi/js/jquery/jquery.center.js/script script type=text/javascript src=../nifi/js/jquery/jquery.each.js/script script type=text/javascript src=../nifi/js/jquery/jquery.tab.js/script script type=text/javascript src=../nifi/js/jquery/modal/jquery.modal.js/script script type=text/javascript src=../nifi/js/jquery/combo/jquery.combo.js/script script type=text/javascript src=../nifi/js/jquery/jquery.ellipsis.js/script -script type=text/javascript src=../nifi/js/jquery/jquery-ui-1.8.10.custom.min.js/script +script type=text/javascript src=../nifi/js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js/script script type=text/javascript src=../nifi/js/jquery/qtip2/jquery.qtip.min.js/script script type=text/javascript src=../nifi/js/json2.js/script -script type=text/javascript src=../nifi/js/jquery/jquery.event.drag-2.0.min.js/script +script type=text/javascript src=../nifi/js/jquery/jquery.event.drag-2.2.min.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellrangedecorator.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellrangeselector.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/plugins/slick.cellselectionmodel.js/script @@ -39,24 +51,11 @@ script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.dataview.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.core.js/script script type=text/javascript src=../nifi/js/jquery/slickgrid/slick.grid.js/script -script type=text/javascript src=../nifi/js/codemirror/lib/codemirror.js/script -script type=text/javascript
[31/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
deleted file mode 100755
index f9563e1..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.js
+++ /dev/null
@@ -1,9017 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 3 16:18:21 2011 -0400
- */
-(function (window, undefined) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-navigator = window.navigator,
-location = window.location;
-var jQuery = (function () {
-
-// Define a local copy of jQuery
-var jQuery = function (selector, context) {
-// The jQuery object is actually just the init constructor
'enhanced'
-return new jQuery.fn.init(selector, context, rootjQuery);
-},
-// Map over jQuery in case of overwrite
-_jQuery = window.jQuery,
-// Map over the $ in case of overwrite
-_$ = window.$,
-// A central reference to the root jQuery(document)
-rootjQuery,
-// A simple way to check for HTML strings or ID strings
-// Prioritize #id over tag to avoid XSS via location.hash
(#9521)
-quickExpr = /^(?:[^#]*([\w\W]+)[^]*$|#([\w\-]*)$)/,
-// Check if a string has a non-whitespace character in it
-rnotwhite = /\S/,
-// Used for trimming whitespace
-trimLeft = /^\s+/,
-trimRight = /\s+$/,
-// Check for digits
-rdigit = /\d/,
-// Match a standalone tag
-rsingleTag = /^(\w+)\s*\/?(?:\/\1)?$/,
-// JSON RegExp
-rvalidchars = /^[\],:{}\s]*$/,
-rvalidescape = /\\(?:[\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-rvalidtokens =
/[^\\\n\r]*|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-// Useragent RegExp
-rwebkit = /(webkit)[ \/]([\w.]+)/,
-ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-rmsie = /(msie) ([\w.]+)/,
-rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-// Matches dashed string for camelizing
-rdashAlpha = /-([a-z]|[0-9])/ig,
-rmsPrefix = /^-ms-/,
-// Used by jQuery.camelCase as callback to replace()
-fcamelCase = function (all, letter) {
-return (letter + ).toUpperCase();
-},
-// Keep a UserAgent string for use with jQuery.browser
-userAgent = navigator.userAgent,
-// For matching the engine and version of the browser
-browserMatch,
-// The deferred used on DOM ready
-readyList,
-// The ready event handler
-DOMContentLoaded,
-// Save a reference to some core methods
-toString = Object.prototype.toString,
-hasOwn = Object.prototype.hasOwnProperty,
-push = Array.prototype.push,
-slice = Array.prototype.slice,
-trim = String.prototype.trim,
-indexOf = Array.prototype.indexOf,
-// [[Class]] - type pairs
-class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-constructor: jQuery,
-init: function (selector, context, rootjQuery) {
-var match, elem, ret, doc;
-
-// Handle $(), $(null), or $(undefined)
-if (!selector) {
-return this;
-}
-
-// Handle $(DOMElement)
-if (selector.nodeType) {
-this.context = this[0] = selector;
-this.length = 1;
-return this;
-}
-
-// The body element only exists once, optimize finding it
-if (selector === body !context document.body) {
-this.context = document;
-this[0] = document.body;
-this.selector =
[27/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
index de94dbf..3ecf3d2 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/slickgrid/css/slick.grid.css
@@ -8,7 +8,8 @@ classes should alter those!
.slick-header.ui-state-default, .slick-headerrow.ui-state-default {
width: 100%;
overflow: hidden;
- border-left: 0px;
+ /*border-left: 0px;*/
+ border: 0px;
}
.slick-header-columns, .slick-headerrow-columns {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
new file mode 100755
index 000..d441f75
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/animated-overlay.gif
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
new file mode 100755
index 000..b1776f8
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_0_aa_40x100.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
new file mode 100755
index 000..79969e6
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_flat_75_ff_40x100.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100755
index 000..1e35525
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
new file mode 100755
index 000..103f966
Binary files /dev/null and
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/images/ui-bg_glass_65_ff_1x400.png
differ
[41/51] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
index a1d0caf..91363b8 100755
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/minicolors/jquery.minicolors.css
@@ -2,10 +2,18 @@
position: relative;
}
+.minicolors-sprite {
+background-image:
url(data:image/png;base64,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
[29/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
new file mode 100644
index 000..e5ace11
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-2.1.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. |
jquery.org/license */
+!function(a,b){object==typeof moduleobject==typeof
module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw
new Error(jQuery requires a window with a document);return
b(a)}:b(a)}(undefined!=typeof window?window:this,function(a,b){var
c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m=2.1.1,n=function(a,b){return
new
n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return
b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:,length:0,toArray:function(){return
d.call(this)},get:function(a){return
null!=a?0a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var
b=n.merge(this.constructor(),a);return
b.prevObject=this,b.context=this.context,b},each:function(a,b){return
n.each(this,a,b)},map:function(a){return
this.pushStack(n.map(this,function(b,c){return
a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(
this,arguments))},first:function(){return this.eq(0)},last:function(){return
this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0a?b:0);return
this.pushStack(c=0bc?[this[c]]:[])},end:function(){return
this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var
a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for(boolean==typeof
g(j=g,g=arguments[h]||{},h++),object==typeof
g||n.isFunction(g)||(g={}),h===i(g=this,h--);ih;h++)if(null!=(a=arguments[h]))for(b
in
a)c=g[b],d=a[b],g!==d(jd(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=cn.isArray(c)?c:[]):f=cn.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void
0!==d(g[b]=d));return
g},n.extend({expando:jQuery+(m+Math.random()).replace(/\D/g,),isReady:!0,error:function(a){throw
new
Error(a)},noop:function(){},isFunction:function(a){returnfunction===n.type(a)},isArray:Array.isArray,isWindow:function(a){return
null!=aa===a.window},isNumeric:functi
on(a){return!n.isArray(a)a-parseFloat(a)=0},isPlainObject:function(a){returnobject!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor!j.call(a.constructor.prototype,isPrototypeOf)?!1:!0},isEmptyObject:function(a){var
b;for(b in a)return!1;return!0},type:function(a){return
null==a?a+:object==typeof a||function==typeof
a?h[i.call(a)]||object:typeof a},globalEval:function(a){var
b,c=eval;a=n.trim(a),a(1===a.indexOf(use
strict)?(b=l.createElement(script),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return
a.replace(p,ms-).replace(q,r)},nodeName:function(a,b){return
a.nodeNamea.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var
d,e=0,f=a.length,g=s(a);if(c){if(g){for(;fe;e++)if(d=b.apply(a[e],c),d===!1)break}else
for(e in a)if(d=b.apply(a[e],c),d===!1)break}else
if(g){for(;fe;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in
a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){
return null==a?:(a+).replace(o,)},makeArray:function(a,b){var
c=b||[];return null!=a(s(Object(a))?n.merge(c,string==typeof
a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return
null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var
c=+b.length,d=0,e=a.length;cd;d++)a[e++]=b[d];return
a.length=e,a},grep:function(a,b,c){for(var
d,e=[],f=0,g=a.length,h=!c;gf;f++)d=!b(a[f],f),d!==he.push(a[f]);return
e},map:function(a,b,c){var
d,f=0,g=a.length,h=s(a),i=[];if(h)for(;gf;f++)d=b(a[f],f,c),null!=di.push(d);else
for(f in a)d=b(a[f],f,c),null!=di.push(d);return
e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;returnstring==typeof
b(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return
a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void
0},now:Date.now,support:k}),n.each(Boolean Number String Function Array Date
RegExp Object Error.split( ),function(a,b){h[[object
+b+]]=b.toLowerCase()});function s(a){var
b=a.length,c=n.type(a);returnfunction===c||n.isWindow(a)?!1:1===a.nodeTypeb?!0:array===c||0===b||number==typeof
bb0b-1 in a}var t=function(a){var
b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u=sizzle+-new
Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return
[jira] [Commented] (NIFI-169) Better overall build process without using a shell script
[ https://issues.apache.org/jira/browse/NIFI-169?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248580#comment-14248580 ] ASF subversion and git services commented on NIFI-169: -- Commit a94cf4be4b339bf520517d2d00390f8bc3b249e1 in incubator-nifi's branch refs/heads/NIFI-169 from [~joewitt] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=a94cf4b ] Merge branch 'develop' into NIFI-169 Better overall build process without using a shell script - Key: NIFI-169 URL: https://issues.apache.org/jira/browse/NIFI-169 Project: Apache NiFi Issue Type: Improvement Components: Tools Affects Versions: 0.0.1 Reporter: Karl Heinz Marbaise Fix For: 0.0.1 I would suggest to create a better build process which takes advantage of the multi module capabilities of Maven and furthermore of multi threading which can decrease the build time dramatically. Apart from that currently the build process is spreaded over different areas which are configured differently (differen plugin versions etc.) which leads not in a realiable build process. Furthermore this would make integration into a CI environment like Apache area simpler. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (NIFI-27) Update to latest D3 and JQuery libraries
[ https://issues.apache.org/jira/browse/NIFI-27?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=14248578#comment-14248578 ] ASF subversion and git services commented on NIFI-27: - Commit a016bf47bdb778fd436544bd445c1c031aeefb7b in incubator-nifi's branch refs/heads/NIFI-169 from [~mcgilman] [ https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;h=a016bf4 ] NIFI-27: - Reverting to a slightly old version of minicolors to do issues compressing the css in the latests version. Update to latest D3 and JQuery libraries Key: NIFI-27 URL: https://issues.apache.org/jira/browse/NIFI-27 Project: Apache NiFi Issue Type: Improvement Components: Core UI Reporter: Joseph Witt Assignee: Matt Gilman Fix For: 0.0.1 Need to get latest D3 and JQuery Javascript libs. Also need to see if we can just pull these in as deps rather than having to paste in teh codebase. See what other apache projects do. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[17/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of D3.
NIFI-27: - Latest version of D3. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8a0e2cee Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8a0e2cee Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8a0e2cee Branch: refs/heads/NIFI-169 Commit: 8a0e2cee4a2ccdf0f253922a3f900409821e4776 Parents: 4c959f7 Author: Matt Gilman matt.c.gil...@gmail.com Authored: Wed Dec 10 11:26:27 2014 -0500 Committer: Matt Gilman matt.c.gil...@gmail.com Committed: Wed Dec 10 14:36:35 2014 -0500 -- .../nifi-web-ui/src/main/webapp/js/d3/LICENSE | 52 +- .../nifi-web-ui/src/main/webapp/js/d3/d3.min.js | 5390 +- .../src/main/webapp/js/nf/nf-status-history.js | 62 +- 3 files changed, 42 insertions(+), 5462 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8a0e2cee/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE -- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE old mode 100755 new mode 100644 index 83602d5..8301346 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/d3/LICENSE @@ -1,26 +1,26 @@ -Copyright (c) 2013, Michael Bostock -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* The name Michael Bostock may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2010-2014, Michael Bostock +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* The name Michael Bostock may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[36/51] [abbrv] incubator-nifi git commit: NIFI-27: - Upgrading jQuery and jQuery UI. - Replacing all instances of Deferred.then with Deferred.done/fail due to API change introduced in 1.8. - Restorin
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2965258e/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 9e2514c..cdc3ea7 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -72,14 +72,17 @@ nf.Common = {
}
}
},
+
/**
* Determines if the current broswer supports SVG.
*/
SUPPORTS_SVG: !!document.createElementNS
!!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect,
+
/**
* The authorities for the current user.
*/
authorities: undefined,
+
/**
* Sets the authorities for the current user.
*
@@ -88,6 +91,7 @@ nf.Common = {
setAuthorities: function (roles) {
nf.Common.authorities = roles;
},
+
/**
* Loads a script at the specified URL. Supports caching the script on the
browser.
*
@@ -100,6 +104,7 @@ nf.Common = {
url: url
});
},
+
/**
* Determines whether the current user can access provenance.
*
@@ -117,6 +122,7 @@ nf.Common = {
}
return canAccessProvenance;
},
+
/**
* Returns whether or not the current user is a DFM.
*/
@@ -132,6 +138,7 @@ nf.Common = {
}
return dfm;
},
+
/**
* Returns whether or not the current user is a DFM.
*/
@@ -147,6 +154,7 @@ nf.Common = {
}
return admin;
},
+
/**
* Adds a mouse over effect for the specified selector using
* the specified styles.
@@ -163,6 +171,7 @@ nf.Common = {
});
return $(selector).addClass(normalStyle);
},
+
/**
* Method for handling ajax errors.
*
@@ -237,6 +246,7 @@ nf.Common = {
nf.Common.closeCanvas();
}
},
+
/**
* Closes the canvas by removing the splash screen and stats poller.
*/
@@ -256,6 +266,7 @@ nf.Common = {
nf.Canvas.stopStatusPolling();
}
},
+
/**
* Populates the specified field with the specified value. If the value is
* undefined, the field will read 'No value set.' If the value is an empty
@@ -273,6 +284,7 @@ nf.Common = {
return $('#' + target).text(value);
}
},
+
/**
* Clears the specified field. Removes any style that may have been applied
* by a preceeding call to populateField.
@@ -282,6 +294,7 @@ nf.Common = {
clearField: function (target) {
return $('#' + target).removeClass('unset blank').text('');
},
+
/**
* Formats the tooltip for the specified property.
*
@@ -321,6 +334,7 @@ nf.Common = {
return null;
}
},
+
/**
* Formats the specified property (name and value) accordingly.
*
@@ -330,6 +344,7 @@ nf.Common = {
formatProperty: function (name, value) {
return 'divspan class=label' + nf.Common.formatValue(name) + ':
/span' + nf.Common.formatValue(value) + '/div';
},
+
/**
* Formats the specified value accordingly.
*
@@ -346,6 +361,7 @@ nf.Common = {
return 'span class=unsetNo value set/span';
}
},
+
/**
* HTML escapes the specified string. If the string is null
* or undefined, an empty string is returned.
@@ -372,6 +388,7 @@ nf.Common = {
}
};
}()),
+
/**
* Creates a form inline in order to submit the specified params to the
specified URL
* using the specified method.
@@ -407,6 +424,7 @@ nf.Common = {
window.onbeforeunload = previousBeforeUnload;
}
},
+
/**
* Formats the specified array as an unordered list. If the array is not
an
* array, null is returned.
@@ -429,6 +447,7 @@ nf.Common = {
return null;
}
},
+
/**
* Extracts the contents of the specified str after the strToFind. If the
* strToFind is not found or the last part of the str, an empty string is
@@ -448,6 +467,7 @@ nf.Common = {
}
return result;
},
+
/**
* Updates the mouse pointer.
*
@@ -461,6 +481,7 @@ nf.Common = {
$('#' + domId).removeClass('pointer');
}
},
+
/**
* Constants for time duration formatting.
*/
@@ -468,6 +489,7 @@ nf.Common = {
MILLIS_PER_HOUR: 360,
MILLIS_PER_MINUTE: 6,
MILLIS_PER_SECOND: 1000,
+
/**
*
[30/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
deleted file mode 100755
index af79a71..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-1.7.min.js
+++ /dev/null
@@ -1,2934 +0,0 @@
-/*! jQuery v1.7 jquery.com | jquery.org/license */
-(function (a, b) {
-function cA(a) {
-return f.isWindow(a) ? a : a.nodeType === 9 ? a.defaultView ||
a.parentWindow : !1
-}
-function cx(a) {
-if (!cm[a]) {
-var b = c.body, d = f( + a + ).appendTo(b), e =
d.css(display);
-d.remove();
-if (e === none || e === ) {
-cn || (cn = c.createElement(iframe), cn.frameBorder =
cn.width = cn.height = 0), b.appendChild(cn);
-if (!co || !cn.createElement)
-co = (cn.contentWindow || cn.contentDocument).document,
co.write((c.compatMode === CSS1Compat ? !doctype html : ) +
htmlbody), co.close();
-d = co.createElement(a), co.body.appendChild(d), e = f.css(d,
display), b.removeChild(cn)
-}
-cm[a] = e
-}
-return cm[a]
-}
-function cw(a, b) {
-var c = {};
-f.each(cs.concat.apply([], cs.slice(0, b)), function () {
-c[this] = a
-});
-return c
-}
-function cv() {
-ct = b
-}
-function cu() {
-setTimeout(cv, 0);
-return ct = f.now()
-}
-function cl() {
-try {
-return new a.ActiveXObject(Microsoft.XMLHTTP)
-} catch (b) {
-}
-}
-function ck() {
-try {
-return new a.XMLHttpRequest
-} catch (b) {
-}
-}
-function ce(a, c) {
-a.dataFilter (c = a.dataFilter(c, a.dataType));
-var d = a.dataTypes, e = {}, g, h, i = d.length, j, k = d[0], l, m, n,
o, p;
-for (g = 1; g i; g++) {
-if (g === 1)
-for (h in a.converters)
-typeof h == string (e[h.toLowerCase()] =
a.converters[h]);
-l = k, k = d[g];
-if (k === *)
-k = l;
-else if (l !== * l !== k) {
-m = l + + k, n = e[m] || e[* + k];
-if (!n) {
-p = b;
-for (o in e) {
-j = o.split( );
-if (j[0] === l || j[0] === *) {
-p = e[j[1] + + k];
-if (p) {
-o = e[o], o === !0 ? n = p : p === !0 (n =
o);
-break
-}
-}
-}
-}
-!n !p f.error(No conversion from + m.replace( ,
to )), n !== !0 (c = n ? n(c) : p(o(c)))
-}
-}
-return c
-}
-function cd(a, c, d) {
-var e = a.contents, f = a.dataTypes, g = a.responseFields, h, i, j, k;
-for (i in g)
-i in d (c[g[i]] = d[i]);
-while (f[0] === *)
-f.shift(), h === b (h = a.mimeType ||
c.getResponseHeader(content-type));
-if (h)
-for (i in e)
-if (e[i] e[i].test(h)) {
-f.unshift(i);
-break
-}
-if (f[0]in d)
-j = f[0];
-else {
-for (i in d) {
-if (!f[0] || a.converters[i + + f[0]]) {
-j = i;
-break
-}
-k || (k = i)
-}
-j = j || k
-}
-if (j) {
-j !== f[0] f.unshift(j);
-return d[j]
-}
-}
-function cc(a, b, c, d) {
-if (f.isArray(b))
-f.each(b, function (b, e) {
-c || bG.test(a) ? d(a, e) : cc(a + [ + (typeof e == object
|| f.isArray(e) ? b : ) + ], e, c, d)
-});
-else if (!c b != null typeof b == object)
-for (var e in b)
-cc(a + [ + e + ], b[e], c, d);
-else
-d(a, b)
-}
-function cb(a, c) {
-var d, e, g = f.ajaxSettings.flatOptions || {};
-for (d in c)
-c[d] !== b ((g[d] ? a : e || (e = {}))[d] = c[d]);
-e f.extend(!0, a, e)
-}
-function ca(a, c, d, e, f, g) {
-f = f || c.dataTypes[0], g = g || {}, g[f] = !0;
-var h = a[f], i = 0, j = h ? h.length : 0, k = a === bV, l;
-for (; i j (k || !l); i++)
-l = h[i](c, d, e), typeof l
[26/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
new file mode 100755
index 000..ecac757
--- /dev/null
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/ui-smoothness/jquery-ui-1.10.4.js
@@ -0,0 +1,15008 @@
+/*! jQuery UI - v1.10.4 - 2014-12-08
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js,
jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js,
jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js,
jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js,
jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js,
jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js,
jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js,
jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js,
jquery.ui.effect-clip.js, jquery.ui.effect-drop.js,
jquery.ui.effect-explode.js, jquery.ui.effect-fade.js,
jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js,
jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js,
jquery.ui.effect-shake.js, jquery.ui.effect-slide.js,
jquery.ui.effect-transfer.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function( $, undefined ) {
+
+var uuid = 0,
+ runiqueId = /^ui-id-\d+$/;
+
+// $.ui might exist from components with no dependencies, e.g., $.ui.position
+$.ui = $.ui || {};
+
+$.extend( $.ui, {
+ version: 1.10.4,
+
+ keyCode: {
+ BACKSPACE: 8,
+ COMMA: 188,
+ DELETE: 46,
+ DOWN: 40,
+ END: 35,
+ ENTER: 13,
+ ESCAPE: 27,
+ HOME: 36,
+ LEFT: 37,
+ NUMPAD_ADD: 107,
+ NUMPAD_DECIMAL: 110,
+ NUMPAD_DIVIDE: 111,
+ NUMPAD_ENTER: 108,
+ NUMPAD_MULTIPLY: 106,
+ NUMPAD_SUBTRACT: 109,
+ PAGE_DOWN: 34,
+ PAGE_UP: 33,
+ PERIOD: 190,
+ RIGHT: 39,
+ SPACE: 32,
+ TAB: 9,
+ UP: 38
+ }
+});
+
+// plugins
+$.fn.extend({
+ focus: (function( orig ) {
+ return function( delay, fn ) {
+ return typeof delay === number ?
+ this.each(function() {
+ var elem = this;
+ setTimeout(function() {
+ $( elem ).focus();
+ if ( fn ) {
+ fn.call( elem );
+ }
+ }, delay );
+ }) :
+ orig.apply( this, arguments );
+ };
+ })( $.fn.focus ),
+
+ scrollParent: function() {
+ var scrollParent;
+ if (($.ui.ie
(/(static|relative)/).test(this.css(position))) ||
(/absolute/).test(this.css(position))) {
+ scrollParent = this.parents().filter(function() {
+ return
(/(relative|absolute|fixed)/).test($.css(this,position))
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
+ }).eq(0);
+ } else {
+ scrollParent = this.parents().filter(function() {
+ return
(/(auto|scroll)/).test($.css(this,overflow)+$.css(this,overflow-y)+$.css(this,overflow-x));
+ }).eq(0);
+ }
+
+ return (/fixed/).test(this.css(position)) ||
!scrollParent.length ? $(document) : scrollParent;
+ },
+
+ zIndex: function( zIndex ) {
+ if ( zIndex !== undefined ) {
+ return this.css( zIndex, zIndex );
+ }
+
+ if ( this.length ) {
+ var elem = $( this[ 0 ] ), position, value;
+ while ( elem.length elem[ 0 ] !== document ) {
+ // Ignore z-index if position is set to a value
where z-index is ignored by the browser
+ // This makes behavior of this function
consistent across browsers
+ // WebKit always returns auto if the element is
positioned
+
[09/51] [abbrv] incubator-nifi git commit: NIFI-27: - Latest version of qtip2.
NIFI-27:
- Latest version of qtip2.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/658131de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/658131de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/658131de
Branch: refs/heads/NIFI-169
Commit: 658131de13d3a571d2a764600d7fa5b3f85e8e5f
Parents: fe2a331
Author: Matt Gilman matt.c.gil...@gmail.com
Authored: Wed Dec 10 08:35:31 2014 -0500
Committer: Matt Gilman matt.c.gil...@gmail.com
Committed: Wed Dec 10 14:36:33 2014 -0500
--
.../webapp/WEB-INF/pages/bulletin-board.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/cluster.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/history.jsp | 2 +-
.../main/webapp/WEB-INF/pages/provenance.jsp| 2 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp | 2 +-
.../src/main/webapp/WEB-INF/pages/users.jsp | 2 +-
.../main/webapp/js/jquery/qtip2/jquery.qtip.css | 557 ---
.../webapp/js/jquery/qtip2/jquery.qtip.min.css | 3 +
.../webapp/js/jquery/qtip2/jquery.qtip.min.js | 711 +--
12 files changed, 17 insertions(+), 1272 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/658131de/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
index 8669f6c..083862d 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
@@ -24,7 +24,7 @@
${nf.bulletin.board.style.tags}
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
script type=text/javascript
src=js/jquery/jquery-1.7.min.js/script
script type=text/javascript
src=js/jquery/jquery.center.js/script
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/658131de/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index acdd147..c8f2ff7 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -28,7 +28,7 @@
link rel=stylesheet
href=js/jquery/tabbs/jquery.tabbs.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/combo/jquery.combo.css?${project.version} type=text/css /
link rel=stylesheet
href=js/jquery/modal/jquery.modal.css?${project.version} type=text/css /
-link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.css?
type=text/css /
+link rel=stylesheet href=js/jquery/qtip2/jquery.qtip.min.css?
type=text/css /
link rel=stylesheet
href=js/jquery/css/smoothness/jquery-ui-1.8.10.custom.css type=text/css /
link rel=stylesheet
href=js/jquery/minicolors/jquery.minicolors.css type=text/css /
link rel=stylesheet href=js/jquery/slickgrid/css/slick.grid.css
type=text/css /
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/658131de/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index 33fdbb0..e3e7b86 100644
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++
[28/51] [abbrv] incubator-nifi git commit: NIFI-27: - Starting to upgrade jQuery and jQuery UI.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/71e53ae5/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-ui-1.8.10.custom.min.js
--
diff --git
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-ui-1.8.10.custom.min.js
b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-ui-1.8.10.custom.min.js
deleted file mode 100755
index adb6986..000
---
a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/jquery-ui-1.8.10.custom.min.js
+++ /dev/null
@@ -1,6354 +0,0 @@
-/*!
- * jQuery UI 1.8.10
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function (c, j) {
-function k(a) {
-return!c(a).parents().andSelf().filter(function () {
-return c.curCSS(this, visibility) === hidden ||
c.expr.filters.hidden(this)
-}).length
-}
-c.ui = c.ui || {};
-if (!c.ui.version) {
-c.extend(c.ui, {version: 1.8.10, keyCode: {ALT: 18, BACKSPACE: 8,
CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93,
CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36,
INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110,
NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108, NUMPAD_MULTIPLY: 106,
-NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190,
RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91}});
-c.fn.extend({_focus: c.fn.focus, focus: function (a, b) {
-return typeof a === number ? this.each(function () {
-var d = this;
-setTimeout(function () {
-c(d).focus();
-b b.call(d)
-}, a)
-}) : this._focus.apply(this, arguments)
-}, scrollParent: function () {
-var a;
-a = c.browser.msie
/(static|relative)/.test(this.css(position)) ||
/absolute/.test(this.css(position)) ? this.parents().filter(function () {
-return/(relative|absolute|fixed)/.test(c.curCSS(this,
-position, 1))
/(auto|scroll)/.test(c.curCSS(this, overflow, 1) + c.curCSS(this,
overflow-y, 1) + c.curCSS(this, overflow-x, 1))
-}).eq(0) : this.parents().filter(function () {
-return/(auto|scroll)/.test(c.curCSS(this, overflow, 1) +
c.curCSS(this, overflow-y, 1) + c.curCSS(this, overflow-x, 1))
-}).eq(0);
-return/fixed/.test(this.css(position)) || !a.length ?
c(document) : a
-}, zIndex: function (a) {
-if (a !== j)
-return this.css(zIndex, a);
-if (this.length) {
-a = c(this[0]);
-for (var b; a.length a[0] !== document; ) {
-b = a.css(position);
-if (b === absolute || b === relative || b ===
fixed) {
-b = parseInt(a.css(zIndex), 10);
-if (!isNaN(b) b !== 0)
-return b
-}
-a = a.parent()
-}
-}
-return 0
-}, disableSelection: function () {
-return this.bind((c.support.selectstart ? selectstart :
mousedown) + .ui-disableSelection, function (a) {
-a.preventDefault()
-})
-}, enableSelection: function () {
-return this.unbind(.ui-disableSelection)
-}});
-c.each([Width, Height], function (a, b) {
-function d(f, g, l, m) {
-c.each(e, function () {
-g -= parseFloat(c.curCSS(f, padding + this, true)) || 0;
-if (l)
-g -= parseFloat(c.curCSS(f,
-border + this + Width, true)) || 0;
-if (m)
-g -= parseFloat(c.curCSS(f, margin + this, true)) || 0
-});
-return g
-}
-var e = b === Width ? [Left, Right] : [Top, Bottom], h =
b.toLowerCase(), i = {innerWidth: c.fn.innerWidth, innerHeight:
c.fn.innerHeight, outerWidth: c.fn.outerWidth, outerHeight: c.fn.outerHeight};
-c.fn[inner + b] = function (f) {
-if (f === j)
-return i[inner + b].call(this);
-return this.each(function () {
-c(this).css(h, d(this, f) + px)
-})
-};
-c.fn[outer + b] = function (f, g) {
-if (typeof f !== number)
-
