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

Jump to bottom

prevented dragging dropdown menu #15

Merged
merged 1 commit into from
Apr 6, 2015
Merged

prevented dragging dropdown menu #15

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
2 changes: 1 addition & 1 deletion app/views/area.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<span class="entity-link__frame">{{area.Title}}</span>
</a>
<div class="entity-menu-icon"></div>
<div class="entity-menu-container">
<div ng-drag-cancel class="entity-menu-container">
<div class="entity-menu-frame">
<a ui-sref="area.group({areaid: area.Id})"
draggable="false"
Expand Down
2 changes: 1 addition & 1 deletion app/views/group.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class='entity group-entity' ng-drag="true" ng-drag-data="group">
<span class="entity-link__frame">{{group.Title}}</span>
<div class="entity-menu-icon"></div>
<div class="entity-menu-container">
<div ng-drag-cancel class="entity-menu-container">
<div class="entity-menu-frame">
<a class="entity-menu-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false"></a>
<ul class="dropdown-menu pull-right" role="menu">
Expand Down
2 changes: 1 addition & 1 deletion app/views/subarea.view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div class="entity-link__frame">{{subarea.Title}}</div>
<div class="entity-menu-icon"></div>
<div class="entity-menu-container">
<div ng-drag-cancel class="entity-menu-container">
<div class="entity-menu-frame">
<a class="entity-menu-link dropdown-toggle" data-toggle="dropdown" aria-expanded="false" draggable="false"></a>
<ul class="dropdown-menu pull-right" role="menu">
Expand Down
6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,14 @@
"karma-jasmine": "^0.3.5",
"karma-phantomjs-launcher": "^0.1.4",
"load-grunt-tasks": "^3.1.0",
"napa": "^1.2.0",
"time-grunt": "^1.0.0"
},
"engines": {
"node": ">=0.10.0"
},
"scripts": {
"install": "napa"
},
"napa": {
"ngDraggable": "fatlinesofcode/ngDraggable"
"install": "napa kalinichenko/ngDraggable"
},
"browser": {
"ngDraggable": "./node_modules/ngDraggable/ngDraggable.js"
Expand Down