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/document/models/html.js | |
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/document/models/html.js')
-rwxr-xr-x | js/document/models/html.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/js/document/models/html.js b/js/document/models/html.js index 67457863..9cc8ce92 100755 --- a/js/document/models/html.js +++ b/js/document/models/html.js | |||
@@ -22,12 +22,34 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, { | |||
22 | selection: { | 22 | selection: { |
23 | value: [] | 23 | value: [] |
24 | }, | 24 | }, |
25 | //////////////////////////////////////////////////////////////////// | ||
26 | // | ||
27 | selectionContainer: { | ||
28 | value: [] | ||
29 | }, | ||
25 | //////////////////////////////////////////////////////////////////// | 30 | //////////////////////////////////////////////////////////////////// |
26 | // | 31 | // |
27 | draw3DGrid: { | 32 | draw3DGrid: { |
28 | value: false | 33 | value: false |
29 | }, | 34 | }, |
30 | //////////////////////////////////////////////////////////////////// | 35 | //////////////////////////////////////////////////////////////////// |
36 | // | ||
37 | scrollLeft: { | ||
38 | value: null | ||
39 | }, | ||
40 | |||
41 | scrollTop: { | ||
42 | value: null | ||
43 | }, | ||
44 | |||
45 | userContentLeft: { | ||
46 | value: null | ||
47 | }, | ||
48 | |||
49 | userContentTop: { | ||
50 | value: null | ||
51 | }, | ||
52 | //////////////////////////////////////////////////////////////////// | ||
31 | // | 53 | // |
32 | baseHref: { | 54 | baseHref: { |
33 | value: null | 55 | value: null |