Catchup with Upstream master

wix-incubator · Feb 7, 2018 · 53dddc5 · 53dddc5
2 parents 771dd0e + 3d0aed8
commit 53dddc5
Show file tree

Hide file tree

Showing 16 changed files with 7,275 additions and 5,409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ node_modules
 bower_components
 coverage
 treecontrol.iml
-
+.DS_Store
+Chromium 49.0.2623 (Ubuntu)
 
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
                 background: true,
                 options: {
                     files: [
-                        'bower_components/jquery/jquery.js',
+                        'bower_components/jquery/dist/jquery.js',
                         'demo/angular.1.3.12.js',
                         'demo/angular-mocks.1.3.12.js',
                         'angular-tree-control.js',
@@ -64,8 +64,7 @@ module.exports = function(grunt) {
         },
         release: {
             options: {
-                file: 'bower.json',
-                npm: false
+                additionalFiles: ['bower.json']
             }
         }
     });

diff --git a/README.md b/README.md
@@ -1,9 +1,10 @@
 Angular Tree Control
 ================
 
+[![npm version](https://badge.fury.io/js/angular-tree-control.svg)](https://badge.fury.io/js/angular-tree-control)
 [![Bower version](https://badge.fury.io/bo/angular-tree-control.svg)](http://badge.fury.io/bo/angular-tree-control)
-[![Build Status](https://travis-ci.org/wix/angular-tree-control.png)](https://travis-ci.org/wix/angular-tree-control)
-[![Coverage Status](https://coveralls.io/repos/wix/angular-tree-control/badge.png)](https://coveralls.io/r/wix/angular-tree-control)
+[![Build Status](https://travis-ci.org/wix/angular-tree-control.svg)](https://travis-ci.org/wix/angular-tree-control)
+[![Coverage Status](https://coveralls.io/repos/wix/angular-tree-control/badge.svg)](https://coveralls.io/r/wix/angular-tree-control)
 
 Pure [AngularJS](http://www.angularjs.org) based tree control component.
 
@@ -13,7 +14,7 @@ To get started, check out [wix.github.io/angular-tree-control](http://wix.github
 
 ## Why yet another tree control
 
-We have tried a number of tree controls built for angular and experience a of issues with each. As a result we decided
+We have tried a number of tree controls built for angular and experience a lot of issues with each. As a result we decided
 to build a new tree control with the following design guidelines
 
 - Isolated scope - the tree control should not pollute the scope it is rendered at

diff --git a/angular-tree-control.js b/angular-tree-control.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,10 @@
 {
   "name": "angular-tree-control",
-  "version": "0.2.12",
+  "version": "0.2.28",
+  "author": "Yoav Abrahami",
+  "contributors": [
+    "Benjamin Orozco <[email protected]>"
+  ],
   "main": [
     "./angular-tree-control.js",
     "./css/tree-control.css"
@@ -12,11 +16,11 @@
     "karma.conf.js"
   ],
   "dependencies": {
-    "angular": "~1.3.x"
+    "angular": "~1.4.4"
   },
   "devDependencies": {
-    "angular-mocks": "~1.3.x",
-    "jquery": "~2.0.3",
+    "angular-mocks": "~1.4.4",
+    "jquery": "~2.2.2",
     "bootstrap": "~3.1.1",
     "angular-bootstrap": "~0.11.0",
     "google-code-prettify": "1.0.1"

diff --git a/css/tree-control-attribute.css b/css/tree-control-attribute.css
@@ -107,3 +107,51 @@
 [treecontrol].tree-dark {
     color: #ddd;
 }
+
+[treecontrol].tree-boot {
+    color: #428bca;
+    font-family: inherit;
+    font-size: inherit;
+}
+
+[treecontrol].tree-boot > ul > li {
+    padding: 0;
+}
+
+[treecontrol].tree-boot li > .tree-label {
+    display: block;
+    padding: 3px 0;
+    border-radius: 4px;
+}
+
+[treecontrol].tree-boot i.tree-branch-head,
+[treecontrol].tree-boot i.tree-leaf-head {
+    float: left;
+    height: 16px;
+    margin: 5px;
+}
+
+[treecontrol].tree-boot li.tree-expanded i.tree-branch-head {
+    padding: 1px 10px;
+    background: url("../images/folder.png") no-repeat;
+}
+
+[treecontrol].tree-boot li.tree-collapsed i.tree-branch-head {
+    padding: 1px 10px;
+    background: url("../images/folder-closed.png") no-repeat;
+}
+
+[treecontrol].tree-boot li.tree-leaf i.tree-leaf-head {
+    padding: 1px 10px;
+    background: url("../images/file.png") no-repeat;
+}
+
+[treecontrol].tree-boot .tree-label.tree-selected,
+[treecontrol].tree-boot .tree-label.tree-selected:hover {
+    color: #fff;
+    background-color: #428bca;
+}
+
+[treecontrol].tree-boot .tree-label:hover {
+    background-color: #eee;
+}
diff --git a/css/tree-control.css b/css/tree-control.css
@@ -120,3 +120,51 @@ treecontrol.tree-dark li .tree-unselectable {
 treecontrol.tree-dark {
     color: #ddd;
 }
+
+treecontrol.tree-boot {
+    color: #428bca;
+    font-family: inherit;
+    font-size: inherit;
+}
+
+treecontrol.tree-boot > ul > li {
+    padding: 0;
+}
+
+treecontrol.tree-boot li > .tree-label {
+    display: block;
+    padding: 3px 0;
+    border-radius: 4px;
+}
+
+treecontrol.tree-boot i.tree-branch-head,
+treecontrol.tree-boot i.tree-leaf-head {
+    float: left;
+    height: 16px;
+    margin: 5px;
+}
+
+treecontrol.tree-boot li.tree-expanded i.tree-branch-head {
+    padding: 1px 10px;
+    background: url("../images/folder.png") no-repeat;
+}
+
+treecontrol.tree-boot li.tree-collapsed i.tree-branch-head {
+    padding: 1px 10px;
+    background: url("../images/folder-closed.png") no-repeat;
+}
+
+treecontrol.tree-boot li.tree-leaf i.tree-leaf-head {
+    padding: 1px 10px;
+    background: url("../images/file.png") no-repeat;
+}
+
+treecontrol.tree-boot .tree-label.tree-selected,
+treecontrol.tree-boot .tree-label.tree-selected:hover {
+    color: #fff;
+    background-color: #428bca;
+}
+
+treecontrol.tree-boot .tree-label:hover {
+    background-color: #eee;
+}