From 7bc322d8e3173dfcdb0fbbd7f4ab3e08461ab63c Mon Sep 17 00:00:00 2001
From: Slava Fomin II <s.fomin@betsol.ru>
Date: Tue, 24 Jan 2017 15:57:58 +0300
Subject: [PATCH 1/2] Fixed a bug with custom interpolation symbols

Fixes #264.
---
 angular-tree-control.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/angular-tree-control.js b/angular-tree-control.js
index 3043027..b53e837 100644
--- a/angular-tree-control.js
+++ b/angular-tree-control.js
@@ -292,16 +292,19 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                     }
 
                     if(!template) {
-                        template =
-                            '<ul {{options.ulClass}} >' +
-                            '<li ng-repeat="node in node.{{options.nodeChildren}} | filter:filterExpression:filterComparator {{options.orderBy}}" ng-class="headClass(node)" {{options.liClass}}' +
+                        var open = $interpolate.startSymbol();
+                        var close = $interpolate.endSymbol();
+                        template = (
+                            '<ul ' + open + 'options.ulClass' + close + ' >' +
+                            '<li ng-repeat="node in node.' + open + 'options.nodeChildren' + close + ' | filter:filterExpression:filterComparator ' + open + 'options.orderBy' + close + '" ng-class="headClass(node)" ' + open + 'options.liClass' + close + '' +
                             'set-node-to-data>' +
                             '<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
-                            '<i class="tree-leaf-head {{options.iLeafClass}}"></i>' +
-                            '<div class="tree-label {{options.labelClass}}" ng-class="[selectedClass(), unselectableClass()]" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
+                            '<i class="tree-leaf-head ' + open + 'options.iLeafClass' + close + '"></i>' +
+                            '<div class="tree-label ' + open + 'options.labelClass' + close + '" ng-class="[selectedClass(), unselectableClass()]" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
                             '<treeitem ng-if="nodeExpanded()"></treeitem>' +
                             '</li>' +
-                            '</ul>';
+                            '</ul>'
+                        );
                     }
 
                     this.template = $compile($interpolate(template)({options: templateOptions}));

From 1d8d7e1ce6df24da7fe9d74e20755923dc6252e6 Mon Sep 17 00:00:00 2001
From: Slava Fomin II <s.fomin@betsol.ru>
Date: Tue, 24 Jan 2017 16:05:45 +0300
Subject: [PATCH 2/2] Update angular-tree-control.js

---
 angular-tree-control.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/angular-tree-control.js b/angular-tree-control.js
index b53e837..acfb552 100644
--- a/angular-tree-control.js
+++ b/angular-tree-control.js
@@ -292,19 +292,20 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                     }
 
                     if(!template) {
-                        var open = $interpolate.startSymbol();
-                        var close = $interpolate.endSymbol();
-                        template = (
-                            '<ul ' + open + 'options.ulClass' + close + ' >' +
-                            '<li ng-repeat="node in node.' + open + 'options.nodeChildren' + close + ' | filter:filterExpression:filterComparator ' + open + 'options.orderBy' + close + '" ng-class="headClass(node)" ' + open + 'options.liClass' + close + '' +
+                        template =
+                            '<ul {{options.ulClass}} >' +
+                            '<li ng-repeat="node in node.{{options.nodeChildren}} | filter:filterExpression:filterComparator {{options.orderBy}}" ng-class="headClass(node)" {{options.liClass}}' +
                             'set-node-to-data>' +
                             '<i class="tree-branch-head" ng-class="iBranchClass()" ng-click="selectNodeHead(node)"></i>' +
-                            '<i class="tree-leaf-head ' + open + 'options.iLeafClass' + close + '"></i>' +
-                            '<div class="tree-label ' + open + 'options.labelClass' + close + '" ng-class="[selectedClass(), unselectableClass()]" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
+                            '<i class="tree-leaf-head {{options.iLeafClass}}"></i>' +
+                            '<div class="tree-label {{options.labelClass}}" ng-class="[selectedClass(), unselectableClass()]" ng-click="selectNodeLabel(node)" tree-transclude></div>' +
                             '<treeitem ng-if="nodeExpanded()"></treeitem>' +
                             '</li>' +
-                            '</ul>'
-                        );
+                            '</ul>';
+                        template = template
+                            .replace(/{{/g, $interpolate.startSymbol())
+                            .replace(/}}/g, $interpolate.endSymbol())
+                        ;
                     }
 
                     this.template = $compile($interpolate(template)({options: templateOptions}));