diff --git a/forms/account/address-list/address-list.js b/forms/account/address-list/address-list.js index 8fc092be..22e8cfbd 100644 --- a/forms/account/address-list/address-list.js +++ b/forms/account/address-list/address-list.js @@ -12,8 +12,8 @@ Hedera.AddressList = new Class ,onAddAddressClick: function () { this.hash.setAll ({ - 'form': 'account/address', - 'address': 0 + form: 'account/address', + address: 0 }); } @@ -30,13 +30,5 @@ Hedera.AddressList = new Class form.refresh (); } } - - ,repeaterFunc: function (res, form) - { - res.$.link.href = this.hash.make ({ - form: 'account/address', - address: form.$.id - }); - } }); diff --git a/forms/account/address-list/ui.xml b/forms/account/address-list/ui.xml index 9d824cbc..8b60520e 100755 --- a/forms/account/address-list/ui.xml +++ b/forms/account/address-list/ui.xml @@ -30,9 +30,12 @@ id="default-address" lot="user-form" name="default_address"/> - + - +
-
+
- SELECT title, date_time, text, image, id FROM news + SELECT title, text, image, id FROM news WHERE tag != 'course' ORDER BY priority, date_time DESC @@ -22,11 +22,6 @@

{{title}}

-
diff --git a/js/vn/compiler-element.js b/js/vn/compiler-element.js index 86c0eb60..47688855 100644 --- a/js/vn/compiler-element.js +++ b/js/vn/compiler-element.js @@ -1,6 +1,7 @@ var Compiler = require ('./compiler'); var Component = require ('./component'); +var kebabToCamel = require ('./string-util').kebabToCamel; var specialAttrs = { id : 1, @@ -37,7 +38,7 @@ module.exports = new Class if (this.isEvent (attribute)) events[attribute.substr (3)] = value; else if (objectAttrs[attribute]) - objectProps[attribute] = value; + objectProps[attribute] = kebabToCamel(value); else if (!specialAttrs[attribute]) props[attribute] = this.translateValue (value); } diff --git a/js/vn/scope.js b/js/vn/scope.js index 45b52c6f..2ddffd36 100644 --- a/js/vn/scope.js +++ b/js/vn/scope.js @@ -114,10 +114,14 @@ module.exports = new Class var objects = this.objects; for (var i = objects.length; i--;) - if (objects[i] instanceof VnObject) { - objects[i].unref (); - objects[i].disconnectByInstance (this.builder.signalData); + var object = objects[i]; + + if (object instanceof VnObject) + { + object.unref (); + object.disconnectByInstance (this.builder.signalData); + } } this.parent ();