Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filter mustaches in takeAttributes, other minor tweaks #36

Merged
merged 4 commits into from
Nov 6, 2012
Merged

filter mustaches in takeAttributes, other minor tweaks #36

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcefa70
in takeAttributes, trap attributes containing mustache markup and tre…
Nov 5, 2012
98cce18
s/inUber/inLifecycle, other non-semantic changes; add optional 3rd pa…
Nov 6, 2012
2dd3d5c
Merge branch 'master' of https://github.com/toolkitchen/toolkit
Nov 6, 2012
8013d1a
make asyncMethod return the setTimeout handle
Nov 6, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions src/g-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

// event bindings
//
// <element events="onclick: click, onkeypress: keypress, ..."
// <element handlers="onclick: click, onkeypress: keypress, ..."
//
// create listeners on instances that map named events to
// methods on the instance
Expand Down Expand Up @@ -295,16 +295,29 @@
squelchSideEffects = true;
this.boundAttributes.forEach(function(a) {
if (this.hasAttribute(a)) {
var value = deserializeValue(this.getAttribute(a));
// get raw attribute value
var value = this.getAttribute(a);
// filter out 'mustached' values, these are to be
// replaced with bound-data and are not runtime
// values themselves
if (value.indexOf(bindModel.mustache) >= 0) {
return;
}
// deserialize Boolean or Number values from attribute
value = deserializeValue(value);
if (this[a] !== value) {
// track values that differ from property values
changed.push({name: a, old: this[a]});
// install new value (side-effects squelched)
this[a] = value;
}
}
}, this);
} finally {
squelchSideEffects = false;
}
// invoke side-effects in a batch after initializing
// all values
changed.forEach(function(c) {
propertyChanged.call(this, c.name, c.old);
}, this);
Expand Down Expand Up @@ -365,37 +378,41 @@

// asyncMethod impl

var asyncMethod = function(inMethod, inArgs) {
window.setTimeout(function() {
var asyncMethod = function(inMethod, inArgs, inTimeout) {
return window.setTimeout(function() {
this[inMethod].apply(this, inArgs);
}.bind(this), 0);
}.bind(this), inTimeout || 0);
};

// decorate HTMLElementElement with toolkit API

HTMLElementElement.prototype.component = function(inUber) {
HTMLElementElement.prototype.component = function(inLifecycle) {
var attributes = this.element.attributes;
this.lifecycle({
shadowRootCreated: function(inRoot) {
initialize.call(this, inRoot, inUber);
initialize.call(this, inRoot, inLifecycle);
},
created: function() {
//console.log("created", this);
// TODO(sjmiles): notional event delegate attached to DOM tree
// to explore declarative event mapping as platform feature
this.controller = this;
// automate basic tasks, so applications never have to
automate.call(this,
attributes,
// TODO(sjmiles): remove backward-compatibility expressions
inUber[conventions.OBSERVE_DIRECTIVE] || inUber.published,
inUber[conventions.DELEGATES_DIRECTIVE] || inUber.bindings || inUber.delegates
// TODO(sjmiles): remove deprecated expressions
inLifecycle[conventions.OBSERVE_DIRECTIVE]
|| inLifecycle.published,
inLifecycle[conventions.DELEGATES_DIRECTIVE]
|| inLifecycle.bindings || inLifecycle.delegates
);
takeAttributes.call(this);
if (inUber.created) {
inUber.created.call(this);
if (inLifecycle.created) {
inLifecycle.created.call(this);
}
this.attrObserver = new AttrObserver(this);
}
});
var p = inUber.prototype || {};
var p = inLifecycle.prototype || {};
// attach some API
// TODO(sjmiles): this is probably not the best way to do this;
// probably better to insert another link in the prototype chain
Expand Down