diff options
author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/lib | |
parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/NJUtils.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js index 5aaeb5f2..7dd4c9e8 100755 --- a/js/lib/NJUtils.js +++ b/js/lib/NJUtils.js | |||
@@ -18,16 +18,18 @@ exports.NJUtils = Montage.create(Component, { | |||
18 | 18 | ||
19 | ///// Quick "getElementById" | 19 | ///// Quick "getElementById" |
20 | $ : { | 20 | $ : { |
21 | value: function(id) { | 21 | value: function(id, doc) { |
22 | return document.getElementById(id); | 22 | doc = doc || document; |
23 | return doc.getElementById(id); | ||
23 | } | 24 | } |
24 | }, | 25 | }, |
25 | 26 | ||
26 | ///// Quick "getElementsByClassName" which also returns as an Array | 27 | ///// Quick "getElementsByClassName" which also returns as an Array |
27 | ///// Can return as NodeList by passing true as second argument | 28 | ///// Can return as NodeList by passing true as second argument |
28 | $$ : { | 29 | $$ : { |
29 | value: function(className, asNodeList) { | 30 | value: function(className, asNodeList, doc) { |
30 | var list = document.getElementsByClassName(className); | 31 | doc = doc || document; |
32 | var list = doc.getElementsByClassName(className); | ||
31 | return (asNodeList) ? list : this.toArray(list); | 33 | return (asNodeList) ? list : this.toArray(list); |
32 | } | 34 | } |
33 | }, | 35 | }, |
@@ -62,7 +64,7 @@ exports.NJUtils = Montage.create(Component, { | |||
62 | value: function(tag, attr, doc) { | 64 | value: function(tag, attr, doc) { |
63 | var _doc, el; | 65 | var _doc, el; |
64 | 66 | ||
65 | _doc = doc ? doc._document : document; | 67 | _doc = doc ? doc.model.views.design.document : document; |
66 | el = _doc.createElement(tag); | 68 | el = _doc.createElement(tag); |
67 | this.decor(el, attr); | 69 | this.decor(el, attr); |
68 | 70 | ||