diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/stage/stage.reel/stage.html | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
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, 0 insertions, 3 deletions
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 79e34802..53410382 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
| @@ -22,9 +22,6 @@ | |||
| 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"} | ||
| 28 | } | 25 | } |
| 29 | }, | 26 | }, |
| 30 | 27 | ||