Sync with Kendo UI Professional

Author: kendo-bot

tests/unit/toolbar/no-csp-tests.js

@@ -6,6 +6,13 @@ describe("Toolbar: no-csp: ", function() {
     beforeEach(function() {
 
         container = $("<div id='toolbar' />").appendTo(Mocha.fixture);
+
+        Mocha.fixture.append(
+            `<script id="myTemplate" type="text/x-kendo-template">
+                        <button id="btn1">fooo</button>
+                        <script>$("\\#btn1").kendoButton({themeColor:"warning"})<\\/script>
+                    </script>`
+        );
     });
 
     afterEach(function() {
@@ -25,4 +32,15 @@ describe("Toolbar: no-csp: ", function() {
         assert.equal(toolbar.element.find("#foo").text(), "test");
     });
 
+    it("external template is evaluated when wrapper components are used in template", function() {
+        let toolbar = container.kendoToolBar({
+            items: [
+                { template: kendo.template($("#myTemplate").html()) }
+            ]
+        }).data("kendoToolBar");
+
+        let btn = kendo.widgetInstance($("#btn1"));
+        assert.isOk(btn instanceof kendo.ui.Button);
+    });
+
 });

tests/unit/toolbar/rendering.js

@@ -1680,6 +1680,40 @@ describe("Toolbar rendering:", function() {
         assert.isOk($("#foo").hasClass("foo"));
     });
 
+    it("template handler is evaluated when wrapper components are used in template", function(done) {
+
+        let toolbar = container.kendoToolBar({
+            items: [{
+                template: function(data) {
+                    var result = '';
+                    result += `<button id="btn" name="btn">foo</button>`; /*kendoTmpPlaceholder*/
+                    queueMicrotask(() => {
+                        jQuery(`#btn`).kendoButton({
+                            "themeColor": `warning`
+                        });
+
+                        let btn = $("#btn").getKendoButton();
+                        assert.isOk(btn instanceof kendo.ui.Button);
+                    });
+                    return result;
+                }
+            }]
+        }).data("kendoToolBar");
+    });
+
+    it("string template is evaluated when wrapper components are used in template", function() {
+
+        let toolbar = container.kendoToolBar({
+            items: [
+                { template: '<button id="btn2">fooo</button><script>$("\#btn2").kendoButton({themeColor:"success"})<\/script>' },
+
+            ]
+        }).data("kendoToolBar");
+
+        let btn = kendo.widgetInstance($("#btn2"));
+        assert.isOk(btn instanceof kendo.ui.Button);
+    });
+
     /* MISC */
     it("click event of disabled button is prevented", function() {
         container.kendoToolBar({
@@ -1809,4 +1843,4 @@ describe("Toolbar rendering:", function() {
         assert.equal(container.find(".k-spacer").index(), 1);
     });
 
-});
+});