integrating the latest montage version

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 27 insertions, 3 deletions

diff --git a/node_modules/montage/ui/loader.reel/loader.js b/node_modules/montage/ui/loader.reel/loader.js
index 941c17da..921c3781 100755
--- a/node_modules/montage/ui/loader.reel/loader.js
+++ b/node_modules/montage/ui/loader.reel/loader.js
@@ -438,11 +438,33 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
         }
     },
 
+/**
+    Boolean that specifies whether to remove the loading content when load is completed
+*/
+    removeContentOnLoad: {
+        value: true
+    },
+
+    _forceContentRemoval: {
+        enumerable: false,
+        value: false
+    },
+
     _contentToRemove: {
         enumerable: false,
         value: null
     },
 
+/**
+    Forces a manual removal of loading content
+*/
+    removeContent: {
+        value: function() {
+            this._forceContentRemoval = true;
+            this.needsDraw = true;
+        }
+    },
+
     draw: {
         value: function() {
             // start loading the mainComponent if we haven't already
@@ -464,9 +486,11 @@ exports.Loader = Montage.create(Component, /** @lends module:montage/ui/loader.L
                 this.element.classList.remove(BOOTSTRAPPING_CLASS_NAME);
                 this.element.classList.remove(LOADING_CLASS_NAME);
 
-                this._contentToRemove.extractContents();
-                this._contentToRemove.detach();
-                this._contentToRemove = null;
+                if(this.removeContentOnLoad || this._forceContentRemoval) {
+                    this._contentToRemove.extractContents();
+                    this._contentToRemove.detach();
+                    this._contentToRemove = null;
+                }
 
                 this.element.classList.add(LOADED_CLASS_NAME);
             }