aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-08 16:25:26 -0800
committerJose Antonio Marquez2012-03-08 16:25:26 -0800
commit3bcdfaa322ac53609b66ecedbace1872048fd310 (patch)
tree5202930aadf0b5da7bb4d79a9f4498b49a13ec3c /js/document
parentb752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28 (diff)
parent3a9c7a57a227a36ec47c6635fc6a0bd4c4b7f9c3 (diff)
downloadninja-3bcdfaa322ac53609b66ecedbace1872048fd310.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/html-document.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index bc27ea7b..0dc26884 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -977,7 +977,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
977 }, 977 },
978 //////////////////////////////////////////////////////////////////// 978 ////////////////////////////////////////////////////////////////////
979 /** 979 /**
980 *pause videos on switching or closing the document 980 *pause videos on switching or closing the document, so that the browser does not keep downloading the media data
981 */ 981 */
982 pauseVideos:{ 982 pauseVideos:{
983 value:function(){ 983 value:function(){
@@ -992,6 +992,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
992 992
993 /** 993 /**
994 * remove the video src on closing the document, so that the browser does not keep downloading the media data, if the tag does not get garbage collected 994 * remove the video src on closing the document, so that the browser does not keep downloading the media data, if the tag does not get garbage collected
995 *removeSrc : boolean to remove the src if the video... set only in the close document flow
995 */ 996 */
996 stopVideos:{ 997 stopVideos:{
997 value:function(){ 998 value:function(){
@@ -1001,7 +1002,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
1001 } 1002 }
1002 } 1003 }
1003 }, 1004 },
1004
1005 pauseAndStopVideos:{ 1005 pauseAndStopVideos:{
1006 value:function(){ 1006 value:function(){
1007 var videosArr = this.documentRoot.getElementsByTagName("video"), i=0; 1007 var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;