diff --git a/ui/wolf.ui.js b/ui/wolf.ui.js old mode 100644 new mode 100755 index d200e49..247f4e4 --- a/ui/wolf.ui.js +++ b/ui/wolf.ui.js @@ -106,8 +106,10 @@ if (def.icon) btcontent.push(new UI.Template("i", { class: "icon" + (def.text ? " with-text" : "") }, { value: def.icon })); if (def.text) - btcontent.push({ value: def.text }); - button = UI.instanceTemplate(new Template("button", null, btcontent), { parent: dialog })[0]; + btcontent.push(new UI.Template(null, null, def.text)); + button = UI.instanceTemplate(new UI.Template("button", null, btcontent), { parent: dialog })[0]; + if (def.class) + button.className = def.class; if (def.default) button.classList.add("default"); if (def.cancel) @@ -209,7 +211,7 @@ function messageDialog(element, modal, text, buttons, controller, callback, onclose) { if (!buttons) buttons = { close: { icon: "close", cancel: true } }; - uiDialog({ value: text }, buttons, element, modal, controller, callback, onclose) + uiDialog(new UI.Template(null, null, text), buttons, element, modal, controller, callback, onclose) } /** diff --git a/wolf.js b/wolf.js old mode 100644 new mode 100755 index 3fae664..e30df73 --- a/wolf.js +++ b/wolf.js @@ -98,7 +98,8 @@ } function loadDependency(name) { require(name, checkFactory(name), error => { - console.error("Error loading module '" + url + "', can not load dependency '" + name + "'."); + var err = error && error.stack ? error.stack : error; + console.error("Error loading module '" + url + "', can not load dependency '" + name + "': " + err); }); } for (var i in deps) @@ -562,7 +563,7 @@ if (insideBind) { if (ch == '}') { insideBind = false; - if (value) + //if (value) //binding with {} means this bindingParts.push({ bind: true, path: value }); value = ""; } else