diff --git a/bower.json b/bower.json
index 7ef6ce1a8fa..8646eb1d19f 100644
--- a/bower.json
+++ b/bower.json
@@ -17,6 +17,7 @@
"angular": "~1.4.0",
"angular-route": "~1.4.0",
"angular-mocks": "~1.4.0",
- "angular-sanitize": "~1.4.0"
+ "angular-sanitize": "~1.4.0",
+ "angular-native-dragdrop": "~1.1.0"
}
}
diff --git a/public/app/components/require.config.js b/public/app/components/require.config.js
index 44c2c7aaa8d..44dd21476e3 100644
--- a/public/app/components/require.config.js
+++ b/public/app/components/require.config.js
@@ -1,4 +1,3 @@
-
require.config({
urlArgs: 'bust=' + (new Date().getTime()),
baseUrl: 'public/app',
@@ -17,7 +16,7 @@ require.config({
angular: '../vendor/angular/angular',
'angular-route': '../vendor/angular-route/angular-route',
'angular-sanitize': '../vendor/angular-sanitize/angular-sanitize',
- 'angular-dragdrop': '../vendor/angular-other/angular-dragdrop',
+ 'angular-dragdrop': '../vendor/angular-native-dragdrop/draganddrop',
'angular-strap': '../vendor/angular-other/angular-strap',
timepicker: '../vendor/angular-other/timepicker',
datepicker: '../vendor/angular-other/datepicker',
@@ -101,5 +100,4 @@ require.config({
'bootstrap-tagsinput': ['jquery'],
},
- waitSeconds: 60,
});
diff --git a/public/test/test-main.js b/public/test/test-main.js
index 720a34b31df..59bd4cbe1ee 100644
--- a/public/test/test-main.js
+++ b/public/test/test-main.js
@@ -21,7 +21,7 @@ require.config({
'angular-route': '../vendor/angular-route/angular-route',
'angular-sanitize': '../vendor/angular-sanitize/angular-sanitize',
angularMocks: '../vendor/angular-mocks/angular-mocks',
- 'angular-dragdrop': '../vendor/angular-other/angular-dragdrop',
+ 'angular-dragdrop': '../vendor/angular-native-dragdrop/draganddrop',
'angular-strap': '../vendor/angular-other/angular-strap',
timepicker: '../vendor/angular-other/timepicker',
datepicker: '../vendor/angular-other/datepicker',
diff --git a/public/vendor/angular-native-dragdrop/.bower.json b/public/vendor/angular-native-dragdrop/.bower.json
new file mode 100644
index 00000000000..d270f02ab32
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/.bower.json
@@ -0,0 +1,37 @@
+{
+ "name": "angular-native-dragdrop",
+ "version": "1.1.0",
+ "homepage": "http://angular-dragdrop.github.io/angular-dragdrop",
+ "authors": [
+ "ganarajpr"
+ ],
+ "description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.",
+ "main": "draganddrop.js",
+ "keywords": [
+ "angular",
+ "drag",
+ "drop",
+ "html5"
+ ],
+ "dependencies": {
+ "angular": "~1.3"
+ },
+ "license": "MIT",
+ "ignore": [
+ "**/.*",
+ "node_modules",
+ "bower_components",
+ "test",
+ "tests"
+ ],
+ "_release": "1.1.0",
+ "_resolution": {
+ "type": "version",
+ "tag": "1.1.0",
+ "commit": "737981e86bd32a5432fa9edf09059ca3c0f22049"
+ },
+ "_source": "git://github.com/angular-dragdrop/angular-dragdrop.git",
+ "_target": "~1.1.0",
+ "_originalSource": "angular-native-dragdrop",
+ "_direct": true
+}
\ No newline at end of file
diff --git a/public/vendor/angular-native-dragdrop/Gulpfile.js b/public/vendor/angular-native-dragdrop/Gulpfile.js
new file mode 100644
index 00000000000..0aa3bdfff72
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/Gulpfile.js
@@ -0,0 +1,15 @@
+/* jshint -W097 */
+'use strict';
+
+/* global require */
+var jshint = require('gulp-jshint');
+var stylish = require('jshint-stylish');
+var gulp = require('gulp');
+
+gulp.task('lint', function() {
+ return gulp.src('./draganddrop.js')
+ .pipe(jshint())
+ .pipe(jshint.reporter(stylish));
+});
+
+gulp.task('default', ['lint']);
diff --git a/public/vendor/angular-native-dragdrop/LICENSE b/public/vendor/angular-native-dragdrop/LICENSE
new file mode 100644
index 00000000000..d239cb9e0d3
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/LICENSE
@@ -0,0 +1,10 @@
+
+The MIT License
+
+Copyright (c) 2015 Ganaraj P R, [Nebithi](http://www.nebithi.com)
+
+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.
\ No newline at end of file
diff --git a/public/vendor/angular-native-dragdrop/README.md b/public/vendor/angular-native-dragdrop/README.md
new file mode 100644
index 00000000000..e668ec4cef4
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/README.md
@@ -0,0 +1,35 @@
+#Angular-DragDrop
+[](https://travis-ci.org/angular-dragdrop/angular-dragdrop)
+[](https://gitter.im/ganarajpr/angular-dragdrop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+Angular-DragDrop is a angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.
+
+This is based on the work done by Jason Turim. While this [blog post](http://jasonturim.wordpress.com/2013/09/01/angularjs-drag-and-drop/) was the inspiration for creating a native Drag and Drop solution, the intention was to create something that was more generic.
+
+This implementation is mainly different from the one posted in the blog in the following areas :
+
+1. Angular-DragDrop does not create an isolate scope. This has huge benefits when it comes to working with other directives. **NOTE :** It also does not pollute the scope with any variables or functions.
+
+2. It does not depend on any kind of an ID attribute ( being either present or generated on the fly ).
+
+3. It allows one to create channels on which different drag and drop directive combinations can work on in the same page ( more on this later ) .
+
+Pull requests are welcome.
+
+[Documentation](http://angular-dragdrop.github.io/angular-dragdrop/)
+
+#Looking for Active Contributors.
+
+This repo needs active contributers and maintainers. If you are interested in being one of the people who would like to actively maintain this repo, please let me know.
+
+
+
+The MIT License
+
+Copyright (c) 2014 Ganaraj P R, [Nebithi](http://www.nebithi.com)
+
+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.
diff --git a/public/vendor/angular-native-dragdrop/bower.json b/public/vendor/angular-native-dragdrop/bower.json
new file mode 100644
index 00000000000..af96e3b4444
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/bower.json
@@ -0,0 +1,27 @@
+{
+ "name": "angular-native-dragdrop",
+ "version": "1.0.8",
+ "homepage": "http://angular-dragdrop.github.io/angular-dragdrop",
+ "authors": [
+ "ganarajpr"
+ ],
+ "description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.",
+ "main": "draganddrop.js",
+ "keywords": [
+ "angular",
+ "drag",
+ "drop",
+ "html5"
+ ],
+ "dependencies": {
+ "angular": "~1.3"
+ },
+ "license": "MIT",
+ "ignore": [
+ "**/.*",
+ "node_modules",
+ "bower_components",
+ "test",
+ "tests"
+ ]
+}
diff --git a/public/vendor/angular-native-dragdrop/demo/css/styles.css b/public/vendor/angular-native-dragdrop/demo/css/styles.css
new file mode 100644
index 00000000000..4dd18383697
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/demo/css/styles.css
@@ -0,0 +1,29 @@
+body {
+ background-color: #f8f7f8;
+}
+
+.heading {
+ border-bottom: 1px solid #b7b7b7;
+ padding-bottom: 10px;
+ margin-bottom: 10px;
+}
+
+.topRow {
+ margin-bottom: 30px;
+}
+
+.on-drag-enter {
+ background-color : #677ba6;
+}
+
+.on-drag-enter-custom {
+ background-color : #d78cc7;
+}
+
+.on-drag-hover {
+ background-color : #3eb352;
+}
+
+.on-drag-hover-custom {
+ background-color : #d7a931;
+}
\ No newline at end of file
diff --git a/public/vendor/angular-native-dragdrop/demo/index.html b/public/vendor/angular-native-dragdrop/demo/index.html
new file mode 100644
index 00000000000..b945a19e835
--- /dev/null
+++ b/public/vendor/angular-native-dragdrop/demo/index.html
@@ -0,0 +1,129 @@
+
+
+
+
+
+ Angular DragDrop (Demo)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Drag and drop between the two lists.
+
+
+
+
Beasts
+
+
Left column of beasts is not draggable and accepts both beasts and priests
+
+
+
+
+
+
+
+ {{man}}
+
+
+
+
+
+
+ {{woman}}
+
+
+
+
+
+
+
+
Priests
+
+
+
+
+
+
+
+ {{man}}
+
+
+
+
+
+
+ {{woman}}
+
+
+
+
+
+
+
+
Terrorists
+
+
Each terrorist list item accepts a new terrorist. Shows inserting into a particular
+ position in an array.
Angular-DragDrop is a AngularJS HTML5 Drag and Drop directive written in pure with no dependency on JQuery.
+
+
+
+
+
+
+
+
Directives
+
+
+
ui-draggable
+
+
+ directive in module ngDragDrop
+
+
+
The ui-draggable attribute tells Angular that the element is draggable. ui-draggable
+ takes an expression as the attribute value. The expression should evaluate to either true or false.
+ You can toggle the draggability of an element using this expression.
+
+
+
+
Additional Attributes
+
+
drag
+
+
The drag property is used to assign the data that needs to be passed along with the dragging
+ element.
+
+
drag-handle-class
+
+
The class used to mark child elements of draggable object to be used as drag handle. Default class name is
+ drag-handle.
+
+ NOTE: If attribute is not present drag handle feature is not active.
+
+
+
on-drop-success
+
+
The on-drop-success attribute takes a function. We can consider this to be an on-drop-success
+ handler function.
+ This can be useful if you need to do some post processing after the dragged element is dropped successfully on
+ the drop site.
+
+
+ NOTE: This callback function is only called when the drop succeeds.
+
+ You can request the drag-end event ( very similiar to requesting the click event in
+ ng-click )
+ by passing $event in the event handler.
+
+
+
+
on-drop-failure
+
+
The on-drop-failure attribute takes a function. We can consider this to be an on-drop-failure
+ handler function.
+ This can be useful if you need to do some post processing after the dragged element is dropped unsuccessfully on
+ any drop site.
+
+
+ NOTE: This callback function is only called when the drop fails.
+
+ You can request the drag-end event ( very similiar to requesting the click event in
+ ng-click )
+ by passing $event in the event handler.
+
+
+
+
+
Usage
+
+
+
+
+ ...
+
+
+
+
+
Details
+
+
+
+
+
+
Param
+
Type
+
Details
+
+
+
+
+
ui-draggable
+
+
Expression that should be
+ evaluated. The given expression should resolve to true or false.
+
+
+
+
drag
+
+
Takes any JSON convertable $scope variable.
+
+
+
drag-handle-class
+
+
Class name used to mark child elements of draggable object to be used as drag handle. If attribute
+ is not present drag handle feature is not used. If attribute is present but have no value
+ drag-handle used as default.
+
+
+
on-drop-success
+
+
Takes any $scope function. Can also pass $event.
+
+
+
on-drop-failure
+
+
Takes any $scope function. Can also pass $event.
+
+
+
drag-channel
+
+
Takes a string that can be used as the channel name for the dragging operation.
+ Default channel is "defaultchannel"
+
+
+
+
+
+
+
+
Events
+
+
On start of dragging an Angular Event ANGULAR_DRAG_START is dispatched from the
+ $rootScope. The event also carries
+ carries the information about the channel in which the dragging has started.
+
+
+
On end of dragging an Angular Event ANGULAR_DRAG_END is dispatched from the $rootScope.
+ The event also carries
+ carries the information about the channel in which the dragging has started.
+
+
+
When hovering a draggable element on top of a drop area an Angular Event ANGULAR_HOVER
+ is dispatched from the $rootScope.
+ The event also carries the information about the channel in which the dragging has started.
+
+
+
+
+
ui-on-drop
+
+
+ directive in module ngDragDrop
+
+
+
The ui-on-drop attribute tells Angular that the element is a drop site. ui-on-drop
+ takes a function as the attribute value. The function will be called when a valid dragged element is dropped in
+ that location.
+ A valid dragged element is one which has the same channel as the drop location.
+
+
+ NOTE : This callback function is only called when the drop succeeds.
+
+ The ui-on-drop callback can request additional parameters. The data that is dragged is available to the
+ callback as $data and its channel as $channel. Apart from this the drop event is exposed as $event.
+
+
Additional Attributes
+
+
drop-channel
+
+
The channel that the drop site accepts. The dragged element should have the same channel as this drop site for it
+ to be droppable at this location. It is possible to provide comma separated list of channels.
+
+
+ NOTE: Also special value of drag-channel attribute is available to accept
+ dragged element with any channel value — *
+
+
+
+
+
+
drop-validate
+
+
Extra validation that makes sure that the drop site accepts the dragged element beyond having the same channel. If
+ not defined, no extra validation is made.
+
+
+ NOTE: This callback function is called only if the channel condition is met, when the element
+ starts being dragged
+
+
+
+
+
+
drag-enter-class
+
+
The class that will be added to the the droppable element when a dragged element ( which is droppable )
+ enters the drop location. The default value for this is on-drag-enter
+
+
drag-hover-class
+
+
The class that will be added to the drop area element when hovering with an element.
+ The default value for this is on-drag-hover
+
+
+
Usage
+
+
+
+
+ ...
+
+
+
+
Details
+
+
+
+
+
+
Param
+
Type
+
Details
+
+
+
+
+
ui-on-drop
+
+
Takes any $scope function. Can also pass $event, $data and $channel.
+
+
+
+
drop-channel
+
+
The channel on which the drop has to listen for drag events.
+ Single value, comma separated list or special value * are possible
+
+
+
drop-validate
+
+
Takes any $scope function. Can also pass $data and $channel
+
+
+
+
drag-enter-class
+
+
A class name that will be put on the droppable element when the dragged objects enters its boundaries.
+ Default class name is on-drag-enter.
+
+
drag-hover-class
+
+
A class name that will be put on the drop area when an element is dragged onto it. Default class
+ name is on-drag-hover.