Merge branch 'refs/heads/Ninja-Internal' into FileIO

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/draw-utils.js

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, {
     },
         ////////////////////////////////////////////////////////////////////
     /**
-     *pause videos on switching or closing the document
+     *pause videos on switching or closing the document, so that the browser does not keep downloading the media data
     */
     pauseVideos:{
         value:function(){
@@ -992,6 +992,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 
     /**
      * 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
+     *removeSrc : boolean to remove the src if the video... set only in the close document flow
     */
     stopVideos:{
         value:function(){
@@ -1001,7 +1002,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             }
         }
     },
-
     pauseAndStopVideos:{
         value:function(){
             var videosArr = this.documentRoot.getElementsByTagName("video"), i=0;