diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/repetition.reel/repetition.js | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/repetition.reel/repetition.js')
-rwxr-xr-x | node_modules/montage/ui/repetition.reel/repetition.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/node_modules/montage/ui/repetition.reel/repetition.js b/node_modules/montage/ui/repetition.reel/repetition.js index acc03747..95790bc3 100755 --- a/node_modules/montage/ui/repetition.reel/repetition.js +++ b/node_modules/montage/ui/repetition.reel/repetition.js | |||
@@ -490,7 +490,9 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul | |||
490 | @param {Function} callback The callback method. | 490 | @param {Function} callback The callback method. |
491 | */ | 491 | */ |
492 | expandComponent: {value: function expandComponent(callback) { | 492 | expandComponent: {value: function expandComponent(callback) { |
493 | this._setupIterationTemplate(); | 493 | if (!this._refreshingItems) { |
494 | this._setupIterationTemplate(); | ||
495 | } | ||
494 | this._isComponentExpanded = true; | 496 | this._isComponentExpanded = true; |
495 | if (callback) { | 497 | if (callback) { |
496 | callback(); | 498 | callback(); |
@@ -542,10 +544,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul | |||
542 | 544 | ||
543 | // called on iteration instantiation | 545 | // called on iteration instantiation |
544 | templateDidLoad: {value: function() { | 546 | templateDidLoad: {value: function() { |
545 | var range = document.createRange(), | 547 | var item = this._deserializedItem, |
546 | item = this._deserializedItem, | 548 | children = item.element.childNodes; |
547 | children = item.element.childNodes, | ||
548 | i; | ||
549 | 549 | ||
550 | item.fragment = document.createDocumentFragment(); | 550 | item.fragment = document.createDocumentFragment(); |
551 | while (children.length > 0) { | 551 | while (children.length > 0) { |
@@ -1134,8 +1134,8 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul | |||
1134 | @function | 1134 | @function |
1135 | */ | 1135 | */ |
1136 | setupIterationDeserialization: {value: function() { | 1136 | setupIterationDeserialization: {value: function() { |
1137 | // Montage.defineProperty(this, "deserializeSelf", {value: this.deserializeIteration}); | 1137 | // Montage.defineProperty(this, "deserializeProperties", {value: this.deserializeIteration}); |
1138 | this.deserializeSelf = this.deserializeIteration; | 1138 | this.deserializeProperties = this.deserializeIteration; |
1139 | }}, | 1139 | }}, |
1140 | /** | 1140 | /** |
1141 | Description TODO | 1141 | Description TODO |
@@ -1214,13 +1214,13 @@ var Repetition = exports.Repetition = Montage.create(Component, /** @lends modul | |||
1214 | @param {Property} serializer TODO | 1214 | @param {Property} serializer TODO |
1215 | */ | 1215 | */ |
1216 | serializeIteration: {value: function(serializer) { | 1216 | serializeIteration: {value: function(serializer) { |
1217 | serializer.set("element", this.element); | 1217 | serializer.setProperty("element", this.element); |
1218 | var childComponents = this.childComponents; | 1218 | var childComponents = this.childComponents; |
1219 | for (var i = 0, l = childComponents.length; i < l; i++) { | 1219 | for (var i = 0, l = childComponents.length; i < l; i++) { |
1220 | serializer.addObject(childComponents[i]); | 1220 | serializer.addObject(childComponents[i]); |
1221 | } | 1221 | } |
1222 | // iterations are already expanded | 1222 | // iterations are already expanded |
1223 | serializer.set("_isComponentExpanded", true); | 1223 | serializer.setProperty("_isComponentExpanded", true); |
1224 | }}, | 1224 | }}, |
1225 | /** | 1225 | /** |
1226 | Description TODO | 1226 | Description TODO |