Merge branch 'release/0.2.27'

Author: pvgnd

angular-tree-control.js

@@ -82,7 +82,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
     }
 
     angular.module( 'treeControl', [] )
-        .constant('treeConfig', {
+        .constant('treeControlConfig', {
             templateUrl: null
         })
         .directive( 'treecontrol', ['$compile', function( $compile ) {
@@ -120,7 +120,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                     filterExpression: "=?",
                     filterComparator: "=?"
                 },
-                controller: ['$scope', '$templateCache', '$interpolate', 'treeConfig', function ($scope, $templateCache, $interpolate, treeConfig) {
+                controller: ['$scope', '$templateCache', '$interpolate', 'treeControlConfig', function ($scope, $templateCache, $interpolate, treeControlConfig) {
 
                     $scope.options = $scope.options || {};
 
@@ -285,7 +285,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                     };
 
                     var template;
-                    var templateUrl = $scope.options.templateUrl || treeConfig.templateUrl;
+                    var templateUrl = $scope.options.templateUrl || treeControlConfig.templateUrl;
 
                     if(templateUrl) {
                         template = $templateCache.get(templateUrl);

index.html

@@ -1185,7 +1185,7 @@ <h1>Custom Equality <small>(options.equality)</small></h1>
 
 <section id="externalTemplate" ng-controller="ExternalTemplate">
     <div class="page-header">
-        <h1>External Template <small>(options.templateUrl, treeConfig.templateUrl)</small></h1>
+        <h1>External Template <small>(options.templateUrl, treeControlConfig.templateUrl)</small></h1>
     </div>
     <div class="row">
         <div class="col-md-6 show-grid">
@@ -1209,8 +1209,8 @@ <h1>External Template <small>(options.templateUrl, treeConfig.templateUrl)</smal
                 <li><code>options.templateUrl</code> for individual tree control.</li>
                 <li>
                     <p>
-                        <code>treeConfig.templateUrl</code> for all tree controls during application <code>config</code> or <code>run</code> step.
-                        ( <code>treeConfig</code> is global injectable value provider)
+                        <code>treeControlConfig.templateUrl</code> for all tree controls during application <code>config</code> or <code>run</code> step.
+                        ( <code>treeControlConfig</code> is global injectable value provider)
                     </p>
                 </li>
             </ul>
@@ -1248,8 +1248,8 @@ <h1>External Template <small>(options.templateUrl, treeConfig.templateUrl)</smal
         // this code snippet is just to show how to use the global external template option but is not used for
         // this specific example. this specific example is using the instance template option
         angular.module('app', ['treeControl'])
-                .run(function (treeConfig) {
-                    treeConfig.templateUrl = 'treeControlExternalTemplate.html';
+                .run(function (treeControlConfig) {
+                    treeControlConfig.templateUrl = 'treeControlExternalTemplate.html';
                 });
     </script>
 

package.json

@@ -1,24 +1,25 @@
 {
-  "name": "angular-tree-control",
-  "version": "0.2.26",
-  "description": "Angular Tree Control",
+  "name": "angular-tree-control-noconflict",
+  "version": "0.2.27",
+  "description": "Angular Tree Control (no conflict)",
   "main": "angular-tree-control.js",
   "scripts": {
     "test": "grunt test"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/wix/angular-tree-control.git"
+    "url": "git://github.com/pvgnd/angular-tree-control.git"
   },
   "author": "Yoav Abrahami",
   "contributors": [
-    "Benjamin Orozco <benoror@gmail.com>"
+      "Benjamin Orozco <benoror@gmail.com>"
+      "Pierrick Vignand <pierrick.vignand@gmail.com>"
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/wix/angular-tree-control/issues"
+    "url": "https://github.com/pvgnd/angular-tree-control/issues"
   },
-  "homepage": "https://github.com/wix/angular-tree-control",
+  "homepage": "https://github.com/pvgnd/angular-tree-control",
   "devDependencies": {
     "grunt": "~0.4.2",
     "grunt-release": "~0.6.0",