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 /js/stage/stage.reel/stage.html | |
| 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 'js/stage/stage.reel/stage.html')
| -rwxr-xr-x | js/stage/stage.reel/stage.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 30c3d231..88cd6149 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -22,6 +22,9 @@ | |||
| 22 | "prototype": "js/stage/stage-deps", | 22 | "prototype": "js/stage/stage-deps", |
| 23 | "properties": { | 23 | "properties": { |
| 24 | "stage": {"@": "owner"} | 24 | "stage": {"@": "owner"} |
| 25 | }, | ||
| 26 | "bindings": { | ||
| 27 | "currentDocument": {"<-": "@owner.activeDocument"} | ||
| 25 | } | 28 | } |
| 26 | }, | 29 | }, |
| 27 | 30 | ||