diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/tools/template/template-creator.js | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/tools/template/template-creator.js')
| -rwxr-xr-x | node_modules/tools/template/template-creator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/tools/template/template-creator.js b/node_modules/tools/template/template-creator.js index 1cd65ddd..374353f0 100755 --- a/node_modules/tools/template/template-creator.js +++ b/node_modules/tools/template/template-creator.js | |||
| @@ -39,7 +39,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le | |||
| 39 | script, | 39 | script, |
| 40 | self = this; | 40 | self = this; |
| 41 | 41 | ||
| 42 | this._objectNamesIndex = {}; | 42 | this._componentNamesIndex = {}; |
| 43 | doc = this._document = document.implementation.createHTMLDocument(""); | 43 | doc = this._document = document.implementation.createHTMLDocument(""); |
| 44 | 44 | ||
| 45 | function copyNode(sourceNode, targetNode, isRootNode) { | 45 | function copyNode(sourceNode, targetNode, isRootNode) { |