From 24b483db367291b72170f969de78efcb1a9b95bd Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 22:53:07 -0700 Subject: integrating the latest montage version Signed-off-by: Valerio Virgillito --- node_modules/montage/core/deserializer.js | 14 +++++------- node_modules/montage/core/event/event-manager.js | 28 ------------------------ node_modules/montage/core/logger.js | 2 +- node_modules/montage/core/serializer.js | 18 +++++---------- 4 files changed, 13 insertions(+), 49 deletions(-) (limited to 'node_modules/montage/core') diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js index b8ed5618..c1c97b2b 100755 --- a/node_modules/montage/core/deserializer.js +++ b/node_modules/montage/core/deserializer.js @@ -332,11 +332,6 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri @param {Array} properties The property names to be deserialized. */ deserializePropertiesForObject: {value: function(object, properties) { - // TODO: ensure backward compatibility - if (properties && "childComponents" in properties) { - properties.childComponents = []; - console.log('Warning: "childComponents" isn\'t supported on components within the current serializaation format, this property will be reset to [].'); - } for (var key in properties) { object[key] = properties[key]; } @@ -846,8 +841,7 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri if (id) { return 'element.getElementById("' + id + '")'; } else { - // TODO: getElemenyById only here for backwards compatibility - return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\') || element.getElementById("' + value + '")'; + return 'element.querySelector(\'*[' + Deserializer._MONTAGE_ID_ATTRIBUTE + '="' + value + '"]\')'; } break; @@ -859,7 +853,8 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri break; case "reference": - var object; + var object, + originalValue = value; if (value in exports) { object = exports[value]; @@ -874,6 +869,9 @@ var Deserializer = Montage.create(Montage, /** @lends module:montage/core/deseri if (parent) { parent[key] = object; } + if (typeof object === "undefined") { + logger.error("Missing object in serialization: '" + originalValue + "'" + (self._origin ? " in " + self._origin : "")); + } return value; break; diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js index 75272f85..d38b9755 100755 --- a/node_modules/montage/core/event/event-manager.js +++ b/node_modules/montage/core/event/event-manager.js @@ -332,29 +332,6 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu this._application = application; } }, -/** - @function - @param {String} composer Event composer. - @param {Array} eventType Event type array. - */ - registerComposer_forEventType_: { - enumerable: false, - value: function(composer, eventType) { - - if (!!this._registeredEventComposers[eventType]) { - throw "Cannot register composer for eventType:" + eventType + ". Already have one registered."; - } - - this._registeredEventComposers[eventType] = composer; - } - }, -/** - @private -*/ - _registeredEventComposers: { - value: {}, - enumerable: false - }, // Dictionary keyed by event types with the collection of handlers per event type // This dictates why the event manager observes events of a particular type @@ -718,12 +695,7 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu } - // Inform any composers about this request if we need to synthesize this eventType if (isNewTarget && typeof target.nativeAddEventListener === "function") { - if (this._registeredEventComposers[eventType]) { - this._registeredEventComposers[eventType].startObservingTarget_forEventType_(target, eventType); - } - this._observeTarget_forEventType_(target, eventType); } diff --git a/node_modules/montage/core/logger.js b/node_modules/montage/core/logger.js index 26094e76..434aa4dd 100755 --- a/node_modules/montage/core/logger.js +++ b/node_modules/montage/core/logger.js @@ -408,7 +408,7 @@ LoggerUI = Montage.create(Montage, /** @lends module:montage/core/logger.LoggerU //YUCK!! I wish I could use a reel!!! var styleTest = "#_montage_logger_inspector {"; styleTest += " border: 1px solid rgba(15,15,15,0.4);"; - styleTest += " position: absolute;"; + styleTest += " position: fixed;"; styleTest += " right: 25px;"; styleTest += " top: 25px;"; styleTest += " -webkit-border-radius: 5px;"; diff --git a/node_modules/montage/core/serializer.js b/node_modules/montage/core/serializer.js index 74080770..ba2fa04a 100755 --- a/node_modules/montage/core/serializer.js +++ b/node_modules/montage/core/serializer.js @@ -458,6 +458,10 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se serializedUnits = {}; objectInfo = Montage.getInfoForObject(object); + if (!this._require) { + throw new Error("Cannot serialize Montage objects without a require function to identify the corresponding package."); + } + moduleId = this._require.identify( objectInfo.moduleId, objectInfo.require @@ -491,15 +495,6 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se if (!properties) { properties = object; propertyNames = Montage.getSerializablePropertyNames(object); - // HACK: only to be able to live together with serialization v1, remover after - var ix; - if ((ix = propertyNames.indexOf("_bindingDescriptors")) > -1) { - propertyNames.splice(ix, 1); - } - if ((ix = propertyNames.indexOf("_eventListenerDescriptors")) > -1) { - propertyNames.splice(ix, 1); - } - // end HACK } serializedUnits.properties = this._serializeObjectLiteral(properties, propertyNames, 3); } @@ -572,14 +567,13 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se */ _serializeElement: {value: function(element) { var attribute = element.getAttribute(this._MONTAGE_ID_ATTRIBUTE), - // TODO: element.id only here for backwards compatibility - id = attribute || element.id; + id = attribute; if (id) { this._externalElements.push(element); return '{"#":"' + id + '"}'; } else { - logger.error("Error: Not possible to serialize a DOM element with no id assigned: " + element.outerHTML); + logger.error("Error: Not possible to serialize a DOM element with no " + this._MONTAGE_ID_ATTRIBUTE + " assigned: " + element.outerHTML); } }}, -- cgit v1.2.3