Merge branch 'master' of https://github.com/Cerzus/angular-gantt into pr-622

Author: Schweigi

assets/angular-gantt-drawtask-plugin.js

@@ -204,6 +204,12 @@ angular.module('angularGanttDemoApp')
                         api.tasks.on.resizeEnd($scope, addEventName('tasks.on.resizeEnd', logTaskEvent));
                     }
 
+                    if (api.tasks.on.drawBegin) {
+                        api.tasks.on.drawBegin($scope, addEventName('tasks.on.drawBegin', logTaskEvent));
+                        //api.tasks.on.draw($scope, addEventName('tasks.on.draw', logTaskEvent));
+                        api.tasks.on.drawEnd($scope, addEventName('tasks.on.drawEnd', logTaskEvent));
+                    }
+
                     api.rows.on.add($scope, addEventName('rows.on.add', logRowEvent));
                     api.rows.on.change($scope, addEventName('rows.on.change', logRowEvent));
                     api.rows.on.move($scope, addEventName('rows.on.move', logRowEvent));

assets/angular-gantt-plugins.js

@@ -234,6 +234,12 @@ angular.module('angularGanttDemoApp')
                         api.tasks.on.resizeEnd($scope, addEventName('tasks.on.resizeEnd', logTaskEvent));
                     }
 
+                    if (api.tasks.on.drawBegin) {
+                        api.tasks.on.drawBegin($scope, addEventName('tasks.on.drawBegin', logTaskEvent));
+                        //api.tasks.on.draw($scope, addEventName('tasks.on.draw', logTaskEvent));
+                        api.tasks.on.drawEnd($scope, addEventName('tasks.on.drawEnd', logTaskEvent));
+                    }
+
                     api.rows.on.add($scope, addEventName('rows.on.add', logRowEvent));
                     api.rows.on.change($scope, addEventName('rows.on.change', logRowEvent));
                     api.rows.on.move($scope, addEventName('rows.on.move', logRowEvent));

demo/app/scripts/controllers/main.js

@@ -66,3 +66,11 @@ Attributes can be defined for a specific `Row` using an object property named `d
       // Or shortcut for enabled property
       'drawTask': <Boolean>
     }
+
+## API
+
+### Events
+
+- **api.tasks.on.drawBegin(task)**, **api.tasks.on.draw(task)**, **api.tasks.on.drawEnd(task)**
+
+    A task is starting to be drawn, being drawn or has stopped being drawn.

demo/dist/scripts/scripts.js

@@ -45,6 +45,8 @@ Move and resize tasks.
 
     default: `true`
 
+## Model
+
 Attributes can be defined for a specific `Row` or `Task` object using an object property named `movable`
 
     {

docs/plugins/drawtask.md

@@ -26,6 +26,10 @@
                     };
                 }
 
+                api.registerEvent('tasks', 'draw');
+                api.registerEvent('tasks', 'drawBegin');
+                api.registerEvent('tasks', 'drawEnd');
+
                 var newTaskModel = function(row) {
                     if (row.model.drawTask && angular.isFunction(row.model.drawTask.taskFactory)) {
                         return row.model.drawTask.taskFactory();
@@ -50,6 +54,23 @@
                             directiveScope.row.updateVisibleTasks();
 
                             directiveScope.row.$scope.$digest();
+
+                            return task;
+                        };
+
+                        var addEventListeners = function(task) {
+                            var raiseDrawEvent = function() {
+                                directiveScope.row.rowsManager.gantt.api.tasks.raise.draw(task);
+                            };
+
+                            directiveScope.row.rowsManager.gantt.api.tasks.raise.drawBegin(task);
+
+                            document.on('mousemove', raiseDrawEvent);
+
+                            document.one('mouseup', function() {
+                                directiveScope.row.rowsManager.gantt.api.tasks.raise.drawEnd(task);
+                                document.off('mousemove', raiseDrawEvent);
+                            });
                         };
 
                         var deferDrawing = function(startX) {
@@ -58,12 +79,13 @@
 
                                 if (Math.abs(startX - currentX) >= scope.moveThreshold) {
                                     element.off('mousemove', moveTrigger);
-                                    addNewTask(startX);
+                                    var task = addNewTask(startX);
+                                    addEventListeners(task);
                                 }
                             };
 
                             element.on('mousemove', moveTrigger);
-                            document.on('mouseup', function() {
+                            document.one('mouseup', function() {
                                 element.off('mousemove', moveTrigger);
                             });
                         };
@@ -78,12 +100,13 @@
                             }
 
                             var enabledValue = utils.firstProperty([rowDrawTask], 'enabled', scope.enabled);
-                            var enabled = angular.isFunction(enabledValue) ? enabledValue(evt): enabledValue;
+                            var enabled = angular.isFunction(enabledValue) ? enabledValue(evt, directiveScope.row) : enabledValue;
                             if (enabled && evtTarget.className.indexOf('gantt-row') > -1) {
                                 var x = mouseOffset.getOffset(evt).x;
 
                                 if (scope.moveThreshold === 0) {
-                                    addNewTask(x, x);
+                                    var task = addNewTask(x);
+                                    addEventListeners(task);
                                 } else {
                                     deferDrawing(x);
                                 }