Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Canvas): Canvas directive to component implementation #640

Merged
merged 1 commit into from
Oct 11, 2017
Merged

fix(Canvas): Canvas directive to component implementation #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/canvas-view/canvas-editor/canvas-editor.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
angular.module('patternfly.canvas').component('pfCanvasEditor', {

bindings: {
chartDataModel: "=",
chartViewModel: "=?",
toolboxTabs: "=",
chartDataModel: '=',
chartViewModel: '=?',
toolboxTabs: '=',
readOnly: '<?'
},
transclude: true,
templateUrl: "canvas-view/canvas-editor/canvas-editor.html",
templateUrl: 'canvas-view/canvas-editor/canvas-editor.html',
controller: function ($timeout) {
var ctrl = this;
var newNodeCount = 0;
Expand Down Expand Up @@ -59,8 +59,8 @@
// focus to filter input box

$timeout(function () {
angular.element(".subtabs>ul").addClass('nav-tabs-pf');
angular.element("#filterFld").focus();
angular.element('.subtabs>u').addClass('nav-tabs-pf');
angular.element('#filterFld').focus();
});
};

Expand All @@ -79,7 +79,7 @@
};

ctrl.tabClicked = function () {
angular.element("#filterFld").focus();
angular.element('#filterFld').focus();
};

/*** Toolbox ***/
Expand Down Expand Up @@ -109,7 +109,7 @@
};

ctrl.tabClicked = function () {
angular.element("#filterFld").focus();
angular.element('#filterFld').focus();
};

ctrl.activeTab = function () {
Expand Down
29 changes: 29 additions & 0 deletions src/canvas-view/canvas-editor/toolbox-items.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
(function () {
'use strict';

angular.module('patternfly.canvas')
.component('toolboxItems', {
templateUrl: 'canvas-view/canvas-editor/toolbox-items.html',
bindings: {
items: '=',
startDragCallback: '<',
clickCallback: '<',
searchText: '='
},
controller: function toolboxItemsController () {
var ctrl = this;

ctrl.itemClicked = function (item) {
if (angular.isFunction(ctrl.clickCallback) && !item.disableInToolbox) {
ctrl.clickCallback(item);
}
};

ctrl.startItemDrag = function (event, ui, item) {
if (angular.isFunction(ctrl.startDragCallback)) {
ctrl.startDragCallback(event, ui, item);
}
};
}
});
})();
39 changes: 0 additions & 39 deletions src/canvas-view/canvas-editor/toolbox-items.directive.js
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions src/canvas-view/canvas-editor/toolbox-items.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<ul class="toolbox-items-list">
<li class="toolbox-item" ng-repeat="item in vm.items | filter:vm.searchText"
data-drag="{{!item.disableInToolbox}}" jqyoui-draggable="{onStart:'vm.startDragCallbackfmDir(item)'}"
ng-class="{'not-draggable': item.disableInToolbox}"
data-jqyoui-options="{revert: 'invalid', helper: 'clone'}"
ng-click="vm.clickCallbackfmDir(item)"
uib-tooltip="{{(item.disableInToolbox ? 'Items cannot be added to the canvas more than once.' : '')}}">
<img ng-if="item.image" src="{{item.image}}" alt="{{item.name}}"/>
<i ng-if="item.icon && !item.image" class="draggable-item-icon {{item.icon}}"></i>
<span>{{ item.name }}</span>
</li>
<li class="toolbox-item" ng-repeat="item in $ctrl.items | filter:$ctrl.searchText"
data-drag="{{!item.disableInToolbox}}" jqyoui-draggable="{onStart:'$ctrl.startDragCallbackfmDir(item)'}"
ng-class="{'not-draggable': item.disableInToolbox}"
data-jqyoui-options="{revert: 'invalid', helper: 'clone'}"
ng-click="$ctrl.clickCallbackfmDir(item)"
uib-tooltip="{{(item.disableInToolbox ? 'Items cannot be added to the canvas more than once.' : '')}}">
<img ng-if="item.image" src="{{item.image}}" alt="{{item.name}}"/>
<i ng-if="item.icon && !item.image" class="draggable-item-icon {{item.icon}}"></i>
<span>{{ item.name }}</span>
</li>
</ul>
Loading