fix(dependencies): Fix enabled option

angular-gantt · Dec 30, 2015 · 25ca8b4 · 25ca8b4
1 parent da89231
commit 25ca8b4
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 51 deletions.
diff --git a/assets/angular-gantt-dependencies-plugin.js b/assets/angular-gantt-dependencies-plugin.js
diff --git a/assets/angular-gantt-plugins.js b/assets/angular-gantt-plugins.js
diff --git a/demo/dist/scripts/vendor.js b/demo/dist/scripts/vendor.js
@@ -46104,7 +46104,7 @@ Github: https://github.com/angular-gantt/angular-gantt.git
 
             this.pluginScope.$watch('enabled', function(newValue, oldValue) {
                 if (newValue !== oldValue) {
-                    self.refresh(true);
+                    self.refresh();
                 }
 
             });
@@ -46117,23 +46117,25 @@ Github: https://github.com/angular-gantt/angular-gantt.git
             }, true);
 
             /**
-             * Add all dependencies defined from a task.
+             * Add all dependencies defined from a task. Dependencies will be added only if plugin is enabled.
              *
              * @param task
              */
             this.addDependenciesFromTask = function(task) {
-                var taskDependencies = task.model.dependencies;
+                if (this.pluginScope.enabled) {
+                    var taskDependencies = task.model.dependencies;
 
-                if (taskDependencies !== undefined) {
-                    if (!angular.isArray(taskDependencies)) {
-                        taskDependencies = [taskDependencies];
-                        task.model.dependencies = taskDependencies;
-                    }
+                    if (taskDependencies !== undefined) {
+                        if (!angular.isArray(taskDependencies)) {
+                            taskDependencies = [taskDependencies];
+                            task.model.dependencies = taskDependencies;
+                        }
 
-                    angular.forEach(taskDependencies, function(taskDependency) {
-                        var dependency = self.addDependency(task, taskDependency);
-                        dependency.connect();
-                    });
+                        angular.forEach(taskDependencies, function(taskDependency) {
+                            var dependency = self.addDependency(task, taskDependency);
+                            dependency.connect();
+                        });
+                    }
                 }
             };
 

diff --git a/docs/plugins/dependencies.md b/docs/plugins/dependencies.md
@@ -27,7 +27,7 @@ Add support for dependency links between tasks using [jsPlumb](https://jsplumbto
 
 - ### enabled
 
-    Enable dependencies support.
+    Enable dependencies display.
 
     default: `true`
 
@@ -138,8 +138,6 @@ can optionnaly be set to an object that will be used for each related
 
 ## API
 
-### Methods
-
 ### Methods
 
 - **api.dependencies.refresh(tasks)**

diff --git a/src/plugins/dependencies/dependenciesManager.factory.js b/src/plugins/dependencies/dependenciesManager.factory.js
@@ -26,7 +26,7 @@
 
             this.pluginScope.$watch('enabled', function(newValue, oldValue) {
                 if (newValue !== oldValue) {
-                    self.refresh(true);
+                    self.refresh();
                 }
 
             });
@@ -39,23 +39,25 @@
             }, true);
 
             /**
-             * Add all dependencies defined from a task.
+             * Add all dependencies defined from a task. Dependencies will be added only if plugin is enabled.
              *
              * @param task
              */
             this.addDependenciesFromTask = function(task) {
-                var taskDependencies = task.model.dependencies;
+                if (this.pluginScope.enabled) {
+                    var taskDependencies = task.model.dependencies;
 
-                if (taskDependencies !== undefined) {
-                    if (!angular.isArray(taskDependencies)) {
-                        taskDependencies = [taskDependencies];
-                        task.model.dependencies = taskDependencies;
-                    }
+                    if (taskDependencies !== undefined) {
+                        if (!angular.isArray(taskDependencies)) {
+                            taskDependencies = [taskDependencies];
+                            task.model.dependencies = taskDependencies;
+                        }
 
-                    angular.forEach(taskDependencies, function(taskDependency) {
-                        var dependency = self.addDependency(task, taskDependency);
-                        dependency.connect();
-                    });
+                        angular.forEach(taskDependencies, function(taskDependency) {
+                            var dependency = self.addDependency(task, taskDependency);
+                            dependency.connect();
+                        });
+                    }
                 }
             };