diff options
author | Jose Antonio Marquez | 2012-05-22 14:47:02 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-22 14:47:02 -0700 |
commit | c5dad8ddc94b2e1c80565dfee072bda88e8880da (patch) | |
tree | 122197204fff1b8adccfc089d6e6869e8c310550 /js/document/document-html.js | |
parent | fe3b8f2d556c1919e4ad504f7f895f6c400d84d2 (diff) | |
parent | 9b6da637d9654727426c6d78f17e3804bbd84ce5 (diff) | |
download | ninja-c5dad8ddc94b2e1c80565dfee072bda88e8880da.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Conflicts:
js/document/document-html.js
Diffstat (limited to 'js/document/document-html.js')
-rwxr-xr-x | js/document/document-html.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/document/document-html.js b/js/document/document-html.js index ae5b73b6..d6b4ba95 100755 --- a/js/document/document-html.js +++ b/js/document/document-html.js | |||
@@ -158,9 +158,6 @@ exports.HtmlDocument = Montage.create(Component, { | |||
158 | // Pause the videos | 158 | // Pause the videos |
159 | //TODO: Move these to be handled on the show/hide methods in the view | 159 | //TODO: Move these to be handled on the show/hide methods in the view |
160 | this.model.views.design.pauseVideos(); | 160 | this.model.views.design.pauseVideos(); |
161 | |||
162 | //TODO: Move this to the document controller | ||
163 | this.model.isActive = false; | ||
164 | } | 161 | } |
165 | }, | 162 | }, |
166 | //////////////////////////////////////////////////////////////////// | 163 | //////////////////////////////////////////////////////////////////// |