Skip to content

Contextmenu #96

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Contextmenu #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a82c8
feat: add contextmenu
boiawang Feb 3, 2015
09f4d59
add icov-report ignore
boiawang Feb 3, 2015
5307ece
delete chrome lcov
boiawang Feb 3, 2015
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ bower_components
coverage
treecontrol.iml
.DS_Store
lcov-report
77 changes: 70 additions & 7 deletions angular-tree-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

angular.module( 'treeControl', [] )
.directive( 'treecontrol', ['$compile', function( $compile ) {
.directive( 'treecontrol', ['$compile', '$document', function( $compile, $document ) {
/**
* @param cssClass - the css class
* @param addClassProperty - should we wrap the class name with class=""
Expand Down Expand Up @@ -38,7 +38,9 @@
orderBy: "@",
reverseOrder: "@",
filterExpression: "=?",
filterComparator: "=?"
filterComparator: "=?",
treeMenuModel: "=",
onClickMenu: "&"
},
controller: ['$scope', function( $scope ) {

Expand Down Expand Up @@ -99,7 +101,6 @@
}
$scope.parentScopeOfTree = $scope.$parent;


function isSelectedNode(node) {
if (!$scope.options.multiSelection && ($scope.options.equality(node, $scope.selectedNode)))
return true;
Expand Down Expand Up @@ -203,12 +204,23 @@
'<li ng-repeat="node in node.' + $scope.options.nodeChildren + ' | filter:filterExpression:filterComparator ' + orderBy + '" ng-class="headClass(node)" '+classIfDefined($scope.options.injectClasses.li, true)+'>' +
'<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
'<i class="tree-leaf-head '+classIfDefined($scope.options.injectClasses.iLeaf, false)+'"></i>' +
'<div class="tree-label '+classIfDefined($scope.options.injectClasses.label, false)+'" ng-class="selectedClass()" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
'<div treenode-contextmenu="contextMenuNode($event, node)" class="tree-label '+classIfDefined($scope.options.injectClasses.label, false)+'" ng-class="selectedClass()" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
'<treeitem ng-if="nodeExpanded()"></treeitem>' +
'</li>' +
'</ul>';

var menuTemplate =
'<div class="dropdown position-fixed" id="menu_{{$id}}">' +
'<ul class="dropdown-menu" role="menu">' +
'<li ng-repeat="item in treeMenuModel track by $index" ng-click="clickMenu(item)">' +
'<a class="pointer" role="menuitem">{{item.label}}' +
'</a>' +
'</li>' +
'</ul>' +
'</div>'

this.template = $compile(template);
this.menuTemplate = $compile(menuTemplate);
}],
compile: function(element, attrs, childTranscludeFn) {
return function ( scope, element, attrs, treemodelCntr ) {
Expand Down Expand Up @@ -256,15 +268,44 @@
});
scope.expandedNodesMap = newExpandedNodesMap;
});

// scope.$watch('expandedNodesMap', function(newValue) {

// }

$document.bind('click', function() {
var dropdown = element.find('.dropdown');
dropdown.removeClass('open');
scope.currentContextNode = {}
});

scope.clickMenu = function(item) {
if (scope.onClickMenu)
scope.onClickMenu({item: item, node: scope.currentContextNode});
};

// scope.$watch('expandedNodesMap', function(newValue) {
//
// });
scope.contextMenuNode = function ( event, node ) {
var dropdown = element.find('.dropdown');
dropdown.addClass('open');

scope.currentContextNode = node;
dropdown.offset({
top: event.pageY,
left: event.pageX
});
};

//Rendering template for a root node
treemodelCntr.template( scope, function(clone) {
element.html('').append( clone );
});

if (scope.treeMenuModel) {
treemodelCntr.menuTemplate( scope, function(clone) {
element.append( clone );
});
}

// save the transclude function from compile (which is not bound to a scope as apposed to the one from link)
// we can fix this to work with the link transclude function with angular 1.2.6. as for angular 1.2.0 we need
// to keep using the compile function
Expand All @@ -273,6 +314,28 @@
}
};
}])
// treenode contextmenu
.directive("treenodeContextmenu", function() {
return {
restrict: 'A',
require: '^treecontrol',
scope: {
contextMenu: '&treenodeContextmenu'
},
link: function( scope, element, attrs, treemodelCntr) {
element.on('contextmenu', function (event) {
event.preventDefault();
event.stopPropagation();

scope.$apply(function() {
scope.contextMenu({
$event: event
});
});
});
}
}
})
.directive("treeitem", function() {
return {
restrict: 'E',
Expand Down
14 changes: 14 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ <h1>Basic Usage <small>(Classic style, default configuration)</small></h1>
<div save-content="classic-html">
<treecontrol class="tree-classic"
tree-model="treedata"
tree-menu-model="menuModel"
on-click-menu="clickMenu(node, item)"
on-selection="showSelected(node)">
label: {{node.label}} ({{node.id}})
</treecontrol>
Expand Down Expand Up @@ -89,6 +91,18 @@ <h1>Basic Usage <small>(Classic style, default configuration)</small></h1>
$scope.showSelected = function(sel) {
$scope.selectedNode = sel;
};

$scope.menuModel = [{
label: '测试1',
value: 1
}, {
label: '测试2',
value: 2
}]

$scope.clickMenu = function(node, item) {
console.log(node, item);
}
}
</script>
</section>
Expand Down
52 changes: 52 additions & 0 deletions test/angular-tree-control-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ describe('treeControl', function() {
$rootScope.$digest();
expect(element.find('li.tree-leaf').length).toBe(0);
});

it('should not render dropdown', function () {
expect(element.find('.dropdown').length).toBe(0);
});
});

describe('customising using options.isLeaf', function () {
Expand Down Expand Up @@ -636,7 +640,55 @@ describe('treeControl', function() {
$rootScope.$digest();
expect(element.find('li:eq(0)').hasClass('tree-expanded')).toBeTruthy();
});
});

describe('treenode-contextmenu', function () {
beforeEach(function () {
$rootScope.treedata = createSubTree(3, 2);
$rootScope.menuModel = [{
label: 'menu_1',
value: 1
}, {
label: 'menu_2',
value: 2
}]
$rootScope.clickMenu = function (node, item) {

};
element = $compile('<treecontrol tree-model="treedata" tree-menu-model="menuModel" on-click-menu="clickMenu(node, item)">{{node.label}}</treecontrol>')($rootScope);
$rootScope.$digest();
});

it('should render dropmenu', function () {
expect(element.find('.dropdown .dropdown-menu li').length).toBe(2);
});

it('should show dropmenu', function () {
element.find('.tree-label:eq(0)').trigger('contextmenu');
expect(element.find('.dropdown').hasClass('open')).toBeTruthy();
});

it('should hide dropmenu after document click', function () {
$('html').click();
expect(element.find('.dropdown').hasClass('open')).toBeFalsy();
});

it('should fix dropmenu position', function () {
element.find('.tree-label:eq(0)').trigger({type: 'contextmenu', pageX: 231, pageY: 398});
dropdown = element.find('.dropdown');

expect(dropdown.css('top')).toBe('398px');
expect(dropdown.css('left')).toBe('231px');
});

it('should can click menu item', function () {
$rootScope.clickMenu = jasmine.createSpy('clickMenu');

element.find('.tree-label:eq(0)').trigger('contextmenu');
element.find('.dropdown .dropdown-menu li:eq(1)').click();

expect($rootScope.clickMenu).toHaveBeenCalledWith($rootScope.treedata[0], $rootScope.menuModel[1]);
});
});

});