upgrading to Montage v0.6

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

1 files changed, 27 insertions, 20 deletions

diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js
index 219fbc5f..509e3406 100755
--- a/node_modules/montage/ui/template.js
+++ b/node_modules/montage/ui/template.js
@@ -18,7 +18,7 @@ var Serializer = require("core/serializer").Serializer;
 var Deserializer = require("core/deserializer").Deserializer;
 var logger = require("core/logger").logger("template");
 var defaultEventManager = require("core/event/event-manager").defaultEventManager;
-var defaultApplication = require("ui/application").application;
+var applicationExports = require("ui/application");
 
 /**
     @class module:montage/ui/template.Template
@@ -48,7 +48,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     @private
 */
     _isLoaded: {value: false},
-    
+
     /**
     Creates a new Template instance from an HTML document element.
     @function
@@ -59,7 +59,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 
         return this;
     }},
-    
+
     __templatesById: {value: {}},
     __templateCallbacksByModuleId: {value: {}},
 
@@ -123,7 +123,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
      @private
     */
     _deserializer: {value:null},
-    
+
     /**
     The deserializer object used by the template.
     @type {module:montage/core/deserializer.Deserializer}
@@ -224,10 +224,16 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         }
         // make sure we use the same require used to create this component to instantiate this reel
         this._deserializer = this._createDeserializer(this._ownerSerialization);
-        
+
         return this;
     }},
 
+    optimize: {
+        value: function() {
+            this.deserializer.optimizeForDocument(this._document);
+        }
+    },
+
     /**
      Instantiates the Template by specifying an object as the owner and a document where the elements referenced in the serialization should be found.
      @function
@@ -237,7 +243,8 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
     */
     instantiateWithOwnerAndDocument: {
         value: function(owner, document, callback) {
-            var self = this;
+            var self = this,
+                defaultApplication = applicationExports.application;
             this.getDeserializer(function(deserializer) {
                 function invokeTemplateDidLoad(objects) {
                     owner = objects.owner;
@@ -351,7 +358,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         this.insertStylesInDocumentIfNeeded(doc);
         this.insertScriptsInDocumentIfNeeded(doc);
     }},
-    
+
     /**
      @private
     */
@@ -359,7 +366,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         enumerable: false,
         value: null
     },
-    
+
     /**
      @private
     */
@@ -367,7 +374,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         enumerable: false,
         value: null
     },
-    
+
     /**
      @private
     */
@@ -375,10 +382,10 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         enumerable: false,
         value: null
     },
-    
+
     /**
      Inserts all styles found in the Template object into the document given.
-     This function is idempotent, it will not insert styles that are already in the document. 
+     This function is idempotent, it will not insert styles that are already in the document.
      @function
      @param {HTMLDocument} doc The document to insert the styles.
      */
@@ -490,7 +497,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 
     /**
      Inserts all scripts found in the Template object into the document given.
-     This function is idempotent, it will not insert scripts that are already in the document. 
+     This function is idempotent, it will not insert scripts that are already in the document.
      @function
      @param {HTMLDocument} doc The document to insert the scripts.
      */
@@ -548,7 +555,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 
         documentHead.appendChild(container);
     }},
-    
+
     /**
      <i>This function is meant to work with insertScriptsInDocumentIfNeeded, insertStylesInDocumentIfNeeded and setupDocument</i>.
      This function informs the caller when the Template styles have been loaded into the document.
@@ -612,7 +619,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 
         return htmlDocument;
     }},
-    
+
     // indexed by module id
     /**
         @private
@@ -621,7 +628,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         enumerable: false,
         value: {}
     },
-    
+
     /**
      Creates an HTMLDocument from an HTML file at the given module id.
      @function
@@ -644,7 +651,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             });
         }
     }},
-    
+
     /**
      Searches for an inline serialization in a document and returns it if found.
      @function
@@ -662,7 +669,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             return null;
         }
     }},
-    
+
     /**
      Searches for an external serialization in a document and returns its content if found.
      @function
@@ -703,7 +710,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             callback(null);
         }
     }},
-    
+
     /**
      Gets the configured Deserializer object ready to deserialize the Template serialization if any.
      @function
@@ -729,7 +736,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             }
         }
     }},
-    
+
     /**
      @private
     */
@@ -780,7 +787,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         serializer.set("owner", this._ownerSerialization);
         serializer.set("markup", this._document.body.innerHTML);
     }},
-    
+
     /**
      @private
      */