Merge pull request #70 from thienhung1989/develop

Upgrade version: v3.0.10.
thienhung1989 · Oct 22, 2020 · 73619e0 · 73619e0
2 parents ac1a5cf + e18a364
commit 73619e0
Show file tree

Hide file tree

Showing 83 changed files with 172,175 additions and 1,089 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@ demo/source
 
 bower_components
 
-yarn.lock
+!yarn.lock
+!package-lock.json
diff --git a/.jshintrc b/.jshintrc
@@ -1,36 +1,38 @@
 {
-  "camelcase": false,
-  "mocha": true,
-  "jasmine": true,
-  "freeze": true,
-  "trailing": true,
-  "white": true,
-  "browserify": true,
-  "qunit": true,
-  "funcscope": true,
-  "laxbreak": true,
-  "phantom": true,
-  "node": true,
-  "noempty": true,
-  "evil": true,
-  "eqeqeq": true,
-  "nocomma": false,
-  "nonstandard": true,
-  "quotmark": "single",
-  "lastsemic": true,
-  "devel": true,
-  "jquery": true,
-  "nonbsp": true,
-  "browser": true,
-  "bitwise": true,
-  "debug": true,
-  "curly": true,
-  "undef": true,
-  "enforceall": true,
-  "eqnull": true,
-  "asi": true,
-  "validthis": true,
-  "nonew": true,
-  "forin": true,
-  "predef": ["angular"]
+    "camelcase": false,
+    "mocha": true,
+    "jasmine": true,
+    "freeze": true,
+    "trailing": true,
+    "white": true,
+    "browserify": true,
+    "qunit": true,
+    "funcscope": true,
+    "laxbreak": true,
+    "phantom": true,
+    "node": true,
+    "noempty": true,
+    "evil": true,
+    "eqeqeq": true,
+    "nocomma": false,
+    "nonstandard": true,
+    "quotmark": "single",
+    "lastsemic": true,
+    "devel": true,
+    "jquery": true,
+    "nonbsp": true,
+    "browser": true,
+    "bitwise": true,
+    "debug": true,
+    "curly": true,
+    "undef": true,
+    "enforceall": true,
+    "eqnull": true,
+    "asi": true,
+    "validthis": true,
+    "nonew": true,
+    "forin": true,
+    "predef": [
+        "angular"
+    ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,45 @@
+## v3.0.10
+* Fixed:
+    * Missing attributes: indent & indent_plus.
+    * Upgrade gulp4.
+    * Add package-lock.json & yarn.lock.
+    * Add jsdoc3.
+
+## v3.0.9
+* Fixed:
+    * The tree control isn't working.
+    * Reconstruct demo.
+    * Optimal code.
+
+## v3.0.8
+* Fixed:
+    * Expand & collection node.
+* Added:
+    * Allow drag & drop when $compileProvider.debugInfoEnabled(false);.
+* Removed:
+    * kama.
+* Optimal code.
+* Reformat code.
+
+## v3.0.7
+* Fixed: 
+    * Node when call function `expand_node`.
+
+## v3.0.6
+* Fixed:
+    * Any errors & testing with angular 1.6.
+
 ## v3.0.4
- * Removed:
+* Removed:
     * `$watch` in node, nodes
     * $icon_class -> node.__icon_class__
 
- * Fixed:
+* Fixed:
     * Indent when error dragging in list.
     * Optimal `$watch` of tree-dnd (faster, stabler).
 
 
- * Added:
+* Added:
     * Just only `plugin` when need *(increment speed init tree)*:
         * Filter.
         * Order By.
@@ -19,12 +50,12 @@
         * Order By.
 
 ## v3.0.3
- * Fix error dragDrop for Tree
- * Optimal getElementChilds
- * Add new Demo *(filter, multi tree)*
- * Problems:
+* Fix error dragDrop for Tree
+* Optimal getElementChilds
+* Add new Demo *(filter, multi tree)*
+* Problems:
     * Error when drag node to thead *(table)*
- * Next feature:
+* Next feature:
     * Split angular-tree-dnd:
         * Only Directive control: next, prev,...
         * Only DragNDrop
@@ -34,29 +65,29 @@
 
 
 ## v3.0.2
- * Add function `Scope.$safeApply()`.
- * Fix Watch
- * Fix Bower.json
- * Fix any error angular 1.2.1.
- * New feature:
-     * Filter.
-     * Add `scope.targeting` *(boolean)*: `true` - when `dragMove` targeting *(tree-dnd over)*.  
-     * Add attribute `enableCollapse` to enable Mode `collapse node` when `dragStart`.
- * Next feature:
+* Add function `Scope.$safeApply()`.
+* Fix Watch
+* Fix Bower.json
+* Fix any error angular 1.2.1.
+* New feature:
+    * Filter.
+    * Add `scope.targeting` *(boolean)*: `true` - when `dragMove` targeting *(tree-dnd over)*.  
+    * Add attribute `enableCollapse` to enable Mode `collapse node` when `dragStart`.
+* Next feature:
     * Multi select.
     * OrderBy data.
 
 ## v3.0.1
- * Add `gulp`, `travis`,...
- * `dragBorder`: allow `drag` indent if `position` of `drag` >= `border` drag.
- * `for_all_descendants`: To access all descendant of node.
+* Add `gulp`, `travis`,...
+* `dragBorder`: allow `drag` indent if `position` of `drag` >= `border` drag.
+* `for_all_descendants`: To access all descendant of node.
 	* param: for_all_descendants(node, fnCallback);
 	* return: false *(when `fnCallback` return `false` or `null`)*, true *(if accessed all descendant)*
 	* fnCallback: to proccess when dir to node.
 		* result: if return true or Object then `break` function `for_all_descendants` *(when function `for_all_descendants` return `false`)*
- * `for_all_ancestors`: sample like `for_all_descendants` *(but use to `ancestors`)*;
+* `for_all_ancestors`: sample like `for_all_descendants` *(but use to `ancestors`)*;
 
- * Attribute `tree-class` if `type`:
+* Attribute `tree-class` if `type`:
 	* `string`: will cast value to `scope.tree_class`
 	* `object`: will cast vaule to `$TreeDnDClass`
 		* '$TreeDnDClass': constant of `class` in Tree, able `extend` by attribute `tree-class`
@@ -73,7 +104,7 @@
 				* '1':  'glyphicon glyphicon-minus', *(able cast by attribute `icon-leaf`)*
 				* '0':  'glyphicon glyphicon-plus', *(able cast by attribute `icon-leaf`)*
 				* '-1': 'glyphicon glyphicon-file', *(able cast by attribute `icon-leaf`)*
- * Attribute `tree-control` - Allow `developer` create new or overdrive all function exist below :
+* Attribute `tree-control` - Allow `developer` create new or overdrive all function exist below :
 	* Directive:
 		* collapse_all: ()
 		* collapse_node: (node)

diff --git a/LICENSE b/LICENSE
@@ -19,4 +19,3 @@ 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/bower.json b/bower.json
@@ -1,58 +1,58 @@
 {
-  "name": "angular-tree-dnd",
-  "version": "3.0.6",
-  "authors": [
-    "Nguyễn Thiện Hùng"
-  ],
-  "homepage": "https://github.com/thienhung1989/angular-tree-dnd",
-  "description": "Display tree table (or list) & event DrapnDrop (allow drag multi tree-dnd include all type: table, ol, ul) by AngularJS",
-  "main": [
-    "dist/ng-tree-dnd.css",
-    "dist/ng-tree-dnd.js"
-  ],
-  "licence": "MIT",
-  "keywords": [
-    "angularjs",
-    "bootstrap",
-    "tree",
-    "grid",
-    "widget",
-    "table",
-    "dnd"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/thienhung1989/angular-tree-dnd"
-  },
-  "ignore": [
-    "temp",
-    "test",
-    ".jshintrc",
-    ".travis.yml",
-    ".bowerrc",
-    ".gitignore",
-    "bower_components",
-    "examples",
-    "demo",
-    "build",
-    "guide",
-    "node_modules",
-    "source",
-    "tasks",
-    "tests",
-    "gulpfile.js",
-    "karma.conf.js",
-    "src"
-  ],
-  "dependencies": {
-    "angular": ">=1.2.1"
-  },
-  "devDependencies": {
-    "angular-mocks": ">=1.2.1",
-    "angular-route": ">=1.2.1",
-    "angular-animate": ">=1.2.1",
-    "angular-bootstrap": "*",
-    "bootstrap-css": "^3.3",
-    "angularjs-toaster": "*"
-  }
+    "name": "angular-tree-dnd",
+    "version": "3.0.7",
+    "authors": [
+        "Nguyễn Thiện Hùng"
+    ],
+    "homepage": "https://github.com/thienhung1989/angular-tree-dnd",
+    "description": "Display tree table (or list) & event DrapnDrop (allow drag multi tree-dnd include all type: table, ol, ul) by AngularJS",
+    "main": [
+        "dist/ng-tree-dnd.css",
+        "dist/ng-tree-dnd.js"
+    ],
+    "licence": "MIT",
+    "keywords": [
+        "angularjs",
+        "bootstrap",
+        "tree",
+        "grid",
+        "widget",
+        "table",
+        "dnd"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/thienhung1989/angular-tree-dnd"
+    },
+    "ignore": [
+        "temp",
+        "test",
+        ".jshintrc",
+        ".travis.yml",
+        ".bowerrc",
+        ".gitignore",
+        "bower_components",
+        "examples",
+        "demo",
+        "build",
+        "guide",
+        "node_modules",
+        "source",
+        "tasks",
+        "tests",
+        "gulpfile.js",
+        "karma.conf.js",
+        "src"
+    ],
+    "dependencies": {
+        "angular": ">=1.2.1"
+    },
+    "devDependencies": {
+        "angular-mocks": ">=1.2.1",
+        "angular-route": ">=1.2.1",
+        "angular-animate": ">=1.2.1",
+        "angular-bootstrap": "*",
+        "bootstrap-css": "^3.3",
+        "angularjs-toaster": "*"
+    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ 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.