From c1cf88e44d2ce852e4c73cce9058e411fd25cd3b Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Fri, 20 Oct 2017 19:22:24 +0200
Subject: [PATCH] Bugs solved, refactor
---
forms/account/address-list/address-list.js | 12 ++----------
forms/account/address-list/ui.xml | 7 +++++--
forms/cms/home/home.js | 2 +-
forms/cms/home/ui.xml | 9 ++-------
js/vn/compiler-element.js | 3 ++-
js/vn/scope.js | 10 +++++++---
6 files changed, 19 insertions(+), 24 deletions(-)
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"/>
- <htk-repeater model="addresses" form-id="iter" renderer="repeaterFunc">
+ <htk-repeater model="addresses" form-id="iter">
<custom>
- <a id="link" class="list-row" title="_EditAddress">
+ <a
+ class="list-row"
+ href="#!form=account/address&address={{id}}"
+ title="_EditAddress">
<div class="actions">
<htk-radio
lot="iter"
diff --git a/forms/cms/home/home.js b/forms/cms/home/home.js
index 1337ae3a..2541114b 100644
--- a/forms/cms/home/home.js
+++ b/forms/cms/home/home.js
@@ -6,7 +6,7 @@ Hedera.Home = new Class
,onStartOrderClick: function ()
{
- this.hash.setAll ({'form': 'ecomerce/catalog'});
+ this.hash.setAll ({form: 'ecomerce/catalog'});
}
});
diff --git a/forms/cms/home/ui.xml b/forms/cms/home/ui.xml
index 79daa16f..ad4c725a 100755
--- a/forms/cms/home/ui.xml
+++ b/forms/cms/home/ui.xml
@@ -10,10 +10,10 @@
on-click="onStartOrderClick"/>
</div>
<div id="main" class="home">
- <div class="column mansonry" id="news-column">
+ <div class="column mansonry">
<htk-repeater>
<db-model property="model">
- 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
</db-model>
@@ -22,11 +22,6 @@
<div class="new">
<div class="top">
<h2>{{title}}</h2>
- <!--
- <p class="new-info">
- <htk-text format="_%a, %e %b %Y" lot="new" name="date_time"/>
- </p>
- -->
<div class="new-text">
<htk-html lot="iter" name="text"/>
</div>
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 ();