Repository: nifi Updated Branches: refs/heads/master 50c02ee45 -> 1df8fe44c
http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js index f539b66..5143dd5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js @@ -96,9 +96,6 @@ nf.RemoteProcessGroupConfiguration = (function () { $('#remote-process-group-yield-duration').val(''); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js index 8ec7c89..bdc5679 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js @@ -41,9 +41,6 @@ nf.RemoteProcessGroupDetails = (function () { nf.Common.clearField('read-only-remote-process-group-yield-duration'); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js index 4a0789e..62424b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js @@ -174,9 +174,6 @@ nf.RemoteProcessGroupPorts = (function () { $('#remote-process-group-output-ports-container').empty(); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); }; http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index 3cd266e..5f22af5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -350,9 +350,6 @@ nf.ReportingTask = (function () { $('#reporting-task-configuration').removeData('reportingTaskDetails'); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); // initialize the property table http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js index eef5b5d..bfd42de 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-search.js @@ -49,7 +49,7 @@ nf.Search = (function () { // show all processors if (!nf.Common.isEmpty(searchResults.processorResults)) { - ul.append('<li class="search-header"><div class="search-result-icon processor-small-icon"></div>Processors</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-processor"></i></div>Processors</li>'); $.each(searchResults.processorResults, function (i, processorMatch) { self._renderItem(ul, processorMatch); }); @@ -57,7 +57,7 @@ nf.Search = (function () { // show all process groups if (!nf.Common.isEmpty(searchResults.processGroupResults)) { - ul.append('<li class="search-header"><div class="search-result-icon process-group-small-icon"></div>Process Groups</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-group"></i></div>Process Groups</li>'); $.each(searchResults.processGroupResults, function (i, processGroupMatch) { self._renderItem(ul, processGroupMatch); }); @@ -65,7 +65,7 @@ nf.Search = (function () { // show all remote process groups if (!nf.Common.isEmpty(searchResults.remoteProcessGroupResults)) { - ul.append('<li class="search-header"><div class="search-result-icon remote-process-group-small-icon"></div>Remote Process Groups</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-group-remote"></i></div>Remote Process Groups</li>'); $.each(searchResults.remoteProcessGroupResults, function (i, remoteProcessGroupMatch) { self._renderItem(ul, remoteProcessGroupMatch); }); @@ -73,7 +73,7 @@ nf.Search = (function () { // show all connections if (!nf.Common.isEmpty(searchResults.connectionResults)) { - ul.append('<li class="search-header"><div class="search-result-icon connection-small-icon"></div>Connections</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-connect"></i></div>Connections</li>'); $.each(searchResults.connectionResults, function (i, connectionMatch) { self._renderItem(ul, connectionMatch); }); @@ -81,7 +81,7 @@ nf.Search = (function () { // show all input ports if (!nf.Common.isEmpty(searchResults.inputPortResults)) { - ul.append('<li class="search-header"><div class="search-result-icon input-port-small-icon"></div>Input Ports</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-port-in"></i></div>Input Ports</li>'); $.each(searchResults.inputPortResults, function (i, inputPortMatch) { self._renderItem(ul, inputPortMatch); }); @@ -89,7 +89,7 @@ nf.Search = (function () { // show all output ports if (!nf.Common.isEmpty(searchResults.outputPortResults)) { - ul.append('<li class="search-header"><div class="search-result-icon output-port-small-icon"></div>Output Ports</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-port-out"></i></div>Output Ports</li>'); $.each(searchResults.outputPortResults, function (i, outputPortMatch) { self._renderItem(ul, outputPortMatch); }); @@ -97,7 +97,7 @@ nf.Search = (function () { // show all funnels if (!nf.Common.isEmpty(searchResults.funnelResults)) { - ul.append('<li class="search-header"><div class="search-result-icon funnel-small-icon"></div>Funnels</li>'); + ul.append('<li class="search-header"><div class="search-result-icon"><i class="icon icon-funnel"></i></div>Funnels</li>'); $.each(searchResults.funnelResults, function (i, funnelMatch) { self._renderItem(ul, funnelMatch); }); @@ -118,7 +118,7 @@ nf.Search = (function () { }); // configure the search field - $('#search-field').zIndex(1250).searchAutocomplete({ + $('#search-field').searchAutocomplete({ appendTo: '#search-flow-results', position: { my: 'right top', http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js index c44a91b..13cf3f5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-selectable.js @@ -44,8 +44,8 @@ nf.Selectable = (function () { } } - // update the toolbar - nf.CanvasToolbar.refresh(); + // inform Angular app that values have changed + nf.ng.Bridge.digest(); // stop propagation d3.event.stopPropagation(); http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index 0670e8f..9463e3e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -540,9 +540,6 @@ nf.Settings = (function () { processTypesGrid.resetActiveCell(); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); }; @@ -1276,9 +1273,6 @@ nf.Settings = (function () { reportingTaskTypesGrid.resetActiveCell(); } } - }).draggable({ - containment: 'parent', - handle: '.dialog-header' }); }; @@ -1624,7 +1618,8 @@ nf.Settings = (function () { // refresh the system diagnostics when clicked nf.Common.addHoverEffect('#settings-refresh-button', 'button-refresh', 'button-refresh-hover').click(function () { if ($('#settings-refresh-required-icon').is(':visible')) { - nf.CanvasHeader.reloadAndClearWarnings(); + nf.ng.Bridge.call('appCtrl.serviceProvider.headerCtrl', + 'appCtrl.serviceProvider.headerCtrl.reloadAndClearWarnings'); } else { nf.Settings.loadSettings(); } http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js deleted file mode 100644 index a7b5f20..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js +++ /dev/null @@ -1,96 +0,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. - */ - -/* global nf */ - -/** - * Creates a new toolbar action. - * - * @argument {jQuery} container The container to add the action to - * @argument {string} action The action to perform - * @argument {string} id The id of the element for the action - * @argument {string} cls The css class for the element - * @argument {string} hoverCls The css class for the hover state of the element - * @argument {string} disableCls The css class for the disabled state of the element - * @argument {string} title The title (tooltip) of the element - * @argument {boolean} secondary If secondary icon will be hidden as the screen gets smallers - */ -nf.ToolbarAction = function (container, action, id, cls, hoverCls, disableCls, title, secondary) { - this.container = container; - this.action = action; - this.id = id; - this.cls = cls; - this.hoverCls = hoverCls; - this.disableCls = disableCls; - this.title = title; - this.secondary = secondary; - this.initAction(); -}; - -nf.ToolbarAction.prototype.container = null; -nf.ToolbarAction.prototype.action = null; -nf.ToolbarAction.prototype.id = null; -nf.ToolbarAction.prototype.cls = null; -nf.ToolbarAction.prototype.hoverCls = null; -nf.ToolbarAction.prototype.disableCls = null; -nf.ToolbarAction.prototype.title = null; -nf.ToolbarAction.prototype.secondary = null; - -/** - * Initializes the toolbar action by dynamically creating an element, - * registering mouse listeners, and inserting it into the DOM. - */ -nf.ToolbarAction.prototype.initAction = function () { - var self = this; - var cls = 'toolbar-icon'; - if (this.secondary === true) { - cls += ' secondary'; - } - - // create the default button - $('<div/>').addClass(cls).attr('id', this.id).attr('title', this.title).mouseover(function () { - if (!$(this).hasClass(self.disableCls)) { - $(this).removeClass(self.cls).addClass(self.hoverCls); - } - }).mouseout(function () { - if (!$(this).hasClass(self.disableCls)) { - $(this).addClass(self.cls).removeClass(self.hoverCls); - } - }).click(function () { - if (!$(this).hasClass(self.disableCls)) { - // hide the context menu - nf.ContextMenu.hide(); - - // execute the action - nf.Actions[self.action](nf.CanvasUtils.getSelection()); - } - }).appendTo(this.container); -}; - -/** - * Enables the toolbar action. - */ -nf.ToolbarAction.prototype.enable = function () { - $('#' + this.id).removeClass(this.disableCls).addClass(this.cls).addClass('pointer'); -}; - -/** - * Disables the toolbar action. - */ -nf.ToolbarAction.prototype.disable = function () { - $('#' + this.id).removeClass(this.cls).addClass(this.disableCls).removeClass('pointer'); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ng-bridge.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ng-bridge.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ng-bridge.js index 920b665..f890a4e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ng-bridge.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-ng-bridge.js @@ -24,6 +24,7 @@ nf.ng.Bridge = (function () { }; AngularBridge.prototype = { constructor: AngularBridge, + /** * Sets the root scope for the angular application being bridged. * @@ -32,6 +33,7 @@ nf.ng.Bridge = (function () { setRootScope: function(scope){ this.rootScope = scope; }, + /** * Inspects the root scope of the bridged angular application to look up * objects (to be provided as the `this` context) and invoke methods. @@ -48,10 +50,10 @@ nf.ng.Bridge = (function () { * */ call: function (thisArg, fun) { - var thisArgArray = thisArg.split("."); - thisArg = this.rootScope; - angular.forEach(thisArgArray, function (value) { - thisArg = thisArg[value]; + var objArray = thisArg.split("."); + var obj = this.rootScope; + angular.forEach(objArray, function (value) { + obj = obj[value]; }); var funArray = fun.split("."); fun = this.rootScope; @@ -59,11 +61,31 @@ nf.ng.Bridge = (function () { fun = fun[value]; }); var args = Array.prototype.slice.call(arguments, 2); - var result = fun.apply(thisArg, args); + var result = fun.apply(obj, args); this.rootScope.$apply(); if(result){ return result; } + }, + + /** + * Inspects the root scope of the bridged angular application to look up + * and return object. + * + * @param {string} name The name of the object to lookup. + * @returns {Object|*} + */ + get: function(name){ + var objArray = name.split("."); + var obj = this.rootScope; + angular.forEach(objArray, function (value) { + obj = obj[value]; + }); + return obj; + }, + + digest: function(){ + this.rootScope.$digest(); } }; var angularBridge = new AngularBridge();
