Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
da4f20b
Add documentation to pipeline-converter & property-descriptor
Aug 8, 2017
1b5b204
Add entire Montage Data repo
Aug 10, 2017
e33659a
Add XHR shim to node tests
Aug 10, 2017
6c432cb
jshint montage-data merge
hthetiot Aug 11, 2017
d953c00
Remove offline-service & dexie dependency from repo
Aug 14, 2017
48eaf73
Remove unused requirements
Aug 15, 2017
10fcd6f
Fix child-service identification bug
Aug 16, 2017
a1e8afa
Add null check when assigning inverse properties
Aug 17, 2017
f7bfba9
Refactor to promisify owner & service in RawPropertyValueToObjectConv…
Aug 17, 2017
d06e430
Interim
Aug 21, 2017
6be5913
Fixes bug where converter's owner is not resolved
Aug 23, 2017
7e331a9
Adjust authorization API
Aug 28, 2017
e879378
Fixes createdDataObjects access from root service
Sep 3, 2017
ad4d663
Merge branch 'master' into features/data
hthetiot Sep 7, 2017
4d409d1
Remove circular dependency between data-service & authorization-manager
Sep 8, 2017
60026af
Update data & service modules to comply with async API
Sep 8, 2017
e935a13
Add null check on RawPropertyValueToObjectConverter.foreignDescriptor
Sep 11, 2017
34f7f90
Adjust raw-data-service.addOneRawData API
Sep 14, 2017
81774a0
Update lodash requires
thibaultzanini Sep 15, 2017
6979c37
Merge branch 'master' into features/data
hthetiot Sep 20, 2017
c2b183b
fix spec list
hthetiot Sep 20, 2017
dc97176
jshint Rrrrr!
hthetiot Sep 20, 2017
a141af8
Update property-descriptor & expression-data-mapping to account for c…
Sep 29, 2017
2ce4914
[lint] Change forin loops to iter over Object.keys
cdebost Oct 2, 2017
8afb48f
[lint] Get rid of empty for loop blocks
cdebost Oct 2, 2017
a72e414
[lint] Put double parentheses around assignment in conditionals
cdebost Oct 2, 2017
3267fb7
[lint] Fix alignment of property keys
cdebost Oct 2, 2017
bb430bd
[lint] Misc whitespace fixes
cdebost Oct 2, 2017
4d2024e
[lint] Simplify _areSameValues conditions
cdebost Oct 2, 2017
f205c03
[lint] Suppress jshint loop warning
cdebost Oct 2, 2017
5bbc32b
Merge branch 'master' into features/data-lint
cdebost Oct 2, 2017
9c01762
Include every dependencies mentioned in mjson/meta files when mopping…
thibaultzanini Oct 3, 2017
ef57f5a
Merge branch 'master' into features/data
hthetiot Oct 4, 2017
585bc8b
Merge branch 'features/data' into features/data-lint
hthetiot Oct 4, 2017
641f439
Remove duplicate storage property in persistent-data-service
cdebost Oct 5, 2017
46d155c
Merge pull request #1876 from montagejs/features/data-lint
cdebost Oct 5, 2017
646c85b
Fix deserialization of property-descriptor & add null check in expres…
Oct 6, 2017
b13d613
Merge branch 'master' into features/data
Oct 9, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion core/converter/pipeline-converter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
var Converter = require("./converter").Converter,
Promise = require("core/promise").Promise;


/**
* Converter that chains a series of converters together
*
*
* @class PipelineConverter
* @extends Converter
*/
exports.PipelineConverter = Converter.specialize({


Expand Down Expand Up @@ -31,10 +37,15 @@ exports.PipelineConverter = Converter.specialize({
* Convert/Revert
*/

/**
* The converters to chain on convert()
* @type {Converter[]}
*/
converters: {
value: undefined
},


convert: {
value: function (value) {
return this._convertWithConverterAtIndex(value, 0);
Expand Down
14 changes: 7 additions & 7 deletions core/event/event-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if (
if (
typeof document !== "undefined" &&
typeof window !== "undefined" &&
typeof Touch === "undefined" &&
typeof Touch === "undefined" &&
"ontouchstart" in window
) {
Touch = function Touch() {}; // jshint ignore:line
Expand Down Expand Up @@ -299,13 +299,13 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan
spliceOne: {
value: function spliceOne(arr, index) {
var len = arr.length;
if (len) {
if (len) {
while (index < len) {
arr[index] = arr[index + 1];
index++;
}
arr.length--;
}
}
}
},
/**
Expand Down Expand Up @@ -1073,8 +1073,8 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan
value: function unregisterEventListener(target, eventType, listener, useCapture) {
//console.log("EventManager.unregisterEventListener", target, eventType, listener, useCapture);

return useCapture ?
this._unregisterEventListener(target, eventType, listener, this._registeredCaptureEventListeners, this._registeredBubbleEventListeners) :
return useCapture ?
this._unregisterEventListener(target, eventType, listener, this._registeredCaptureEventListeners, this._registeredBubbleEventListeners) :
this._unregisterEventListener(target, eventType, listener, this._registeredBubbleEventListeners, this._registeredCaptureEventListeners);
}
},
Expand Down Expand Up @@ -1476,7 +1476,7 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan
eventTypeBucket = this._catptureMethodNameByEventTypeIdentifier_.get(eventType) || (this._catptureMethodNameByEventTypeIdentifier_.set(eventType,new Map())).get(eventType);
return eventTypeBucket.get(identifier) || (eventTypeBucket.set(identifier,("capture" + (capitalizedIdentifier || identifier.toCapitalized()) + (capitalizedEventType || eventType.toCapitalized())))).get(identifier);
} else {
return this._captureMethodNameByEventType_.get(eventType) ||
return this._captureMethodNameByEventType_.get(eventType) ||
(this._captureMethodNameByEventType_.set(eventType, ("capture" + (capitalizedEventType || eventType.toCapitalized())))).get(eventType);
}
}
Expand Down Expand Up @@ -2431,7 +2431,7 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan

// Event Handling
/**
* @property
* @property {Array}
* @description the pointer to the current candidate event listeners.
*
* @private
Expand Down
7 changes: 4 additions & 3 deletions core/meta/property-descriptor.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
if (value !== void 0) {
this._owner = value;
}

this._overridePropertyWithDefaults(deserializer, "cardinality");

if (this.cardinality === -1) {
Expand Down Expand Up @@ -200,7 +201,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
},

_owner: {
value:null
value: null
},

/**
Expand All @@ -213,7 +214,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
},

_name: {
value:null
value: null
},

/**
Expand Down Expand Up @@ -310,7 +311,7 @@ exports.PropertyDescriptor = Montage.specialize( /** @lends PropertyDescriptor#
* @type {string}
* Definition can be used to express a property as the result of evaluating an expression
* An example would be to flatten/traverse two properties across two objects to make its
* content accessible as a new property name. For example, in a many to many relaational
* content accessible as a new property name. For example, in a many to many relational
* style, a Movie would have a toDirector property to a "DirectorRole" which itself would
* point through a toTalent property to the actual Person. A "director" property definition
* would then be "toDirector.toTalent"
Expand Down
2 changes: 2 additions & 0 deletions core/serialization/deserializer/montage-interpreter.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ var MontageContext = Montage.specialize({
objects = this._objects,
object;



if (label in objects) {
return objects[label];
} else if (label in serialization) {
Expand Down
2 changes: 2 additions & 0 deletions core/serialization/deserializer/self-deserializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ var SelfDeserializer = Montage.specialize( {

getObjectByLabel: {
value: function (label) {


return this._context.getObject(label);
}
},
Expand Down
Loading