aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-16 15:42:37 -0700
committerJose Antonio Marquez2012-05-16 15:42:37 -0700
commit857aafee732b6a85fa155ff4a05d1b8fde48f09d (patch)
treee06d330caee280aa05aec46391979e9abdcf974c
parent5cc5d29736d8bf253e3a168cdd6443e839ffb23c (diff)
parentfd54dabad7cbc27a0efb0957155c00d578912909 (diff)
downloadninja-857aafee732b6a85fa155ff4a05d1b8fde48f09d.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js8
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
-rwxr-xr-xjs/ninja.reel/ninja.js6
-rwxr-xr-xjs/stage/stage.reel/stage.js9
-rw-r--r--node_modules/descriptor.json42
-rw-r--r--node_modules/montage/core/change-notification.js1418
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js4
-rwxr-xr-xnode_modules/montage/core/core.js600
-rwxr-xr-xnode_modules/montage/core/deserializer.js4
-rwxr-xr-xnode_modules/montage/core/event/binding.js953
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js56
-rw-r--r--node_modules/montage/core/event/key-manager.js978
-rwxr-xr-xnode_modules/montage/core/exception.js2
-rwxr-xr-xnode_modules/montage/core/extras/array.js292
-rw-r--r--node_modules/montage/core/extras/object.js256
-rwxr-xr-xnode_modules/montage/core/extras/string.js (renamed from node_modules/montage/core/shim/string.js)2
-rw-r--r--node_modules/montage/core/promise-queue.js2
-rwxr-xr-xnode_modules/montage/core/selector.js (renamed from node_modules/montage/core/shim.js)11
-rw-r--r--node_modules/montage/core/selector/abstract-language.js303
-rw-r--r--node_modules/montage/core/selector/abstract-selector.js189
-rw-r--r--node_modules/montage/core/selector/abstract-semantics.js100
-rw-r--r--node_modules/montage/core/selector/language.js381
-rw-r--r--node_modules/montage/core/selector/parser.js62
-rw-r--r--node_modules/montage/core/selector/property-language.js346
-rw-r--r--node_modules/montage/core/selector/semantics.js392
-rwxr-xr-xnode_modules/montage/core/serializer.js18
-rw-r--r--[-rwxr-xr-x]node_modules/montage/core/shim/array.js51
-rw-r--r--node_modules/montage/core/shim/immediate.js57
-rw-r--r--node_modules/montage/core/shim/object.js36
-rwxr-xr-xnode_modules/montage/package.json1
-rwxr-xr-xnode_modules/montage/require/browser.js2
-rwxr-xr-xnode_modules/montage/require/require.js20
-rw-r--r--node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js126
-rw-r--r--node_modules/montage/ui/autocomplete/result-item.reel/result-item.js33
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.html5
-rw-r--r--node_modules/montage/ui/autocomplete/results-list.reel/results-list.js7
-rw-r--r--node_modules/montage/ui/button.reel/button.js6
-rwxr-xr-xnode_modules/montage/ui/component-placeholder.reel/component-placeholder.js146
-rwxr-xr-xnode_modules/montage/ui/component.js163
-rw-r--r--node_modules/montage/ui/composer/key-composer.js385
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js230
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js79
-rw-r--r--node_modules/montage/ui/controller/array-controller.js53
-rwxr-xr-xnode_modules/montage/ui/flow-bezier-spline.js163
-rw-r--r--node_modules/montage/ui/flow-path-cubic.js115
-rw-r--r--node_modules/montage/ui/flow-path-lerp.js112
-rw-r--r--node_modules/montage/ui/flow-path-linear.js83
-rw-r--r--node_modules/montage/ui/flow-path-sigmoid.js148
-rw-r--r--node_modules/montage/ui/flow-path.js215
-rw-r--r--node_modules/montage/ui/flow.reel/flow.html10
-rw-r--r--node_modules/montage/ui/flow.reel/flow.js758
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html2
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js15
-rw-r--r--node_modules/montage/ui/nearest-neighbor-component-search.js122
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js711
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js4
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js4
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html9
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js20
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html18
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.js159
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js262
-rwxr-xr-xnode_modules/montage/ui/substitution.reel/substitution.js14
-rwxr-xr-xnode_modules/montage/ui/tabs.reel/tabs.html3
-rwxr-xr-xnode_modules/montage/ui/template.js9
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.css40
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.html87
-rw-r--r--node_modules/montage/ui/token-field/token-field.reel/token-field.js221
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.css54
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.html45
-rw-r--r--node_modules/montage/ui/token-field/token.reel/token.js91
75 files changed, 7623 insertions, 3715 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 5a36e367..2e8020d3 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -130,10 +130,10 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
130 130
131 bindSnap: { 131 bindSnap: {
132 value: function() { 132 value: function() {
133 this.addEventListener("change@appModel.snap", this.toggleSnap, false); 133 this.addPropertyChangeListener("appModel.snap", this.toggleSnap, false);
134 this.addEventListener("change@appModel.snapGrid", this.toggleSnapGrid, false); 134 this.addPropertyChangeListener("appModel.snapGrid", this.toggleSnapGrid, false);
135 this.addEventListener("change@appModel.snapObjects", this.toggleSnapObjects, false); 135 this.addPropertyChangeListener("appModel.snapObjects", this.toggleSnapObjects, false);
136 this.addEventListener("change@appModel.snapAlign", this.toggleSnapAlign, false); 136 this.addPropertyChangeListener("appModel.snapAlign", this.toggleSnapAlign, false);
137 } 137 }
138 }, 138 },
139 139
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index feced079..041e7ed7 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.8.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index 9e77759f..a5fab11c 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -16,7 +16,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
16 this.findDirectory.identifier = "findDirectory"; 16 this.findDirectory.identifier = "findDirectory";
17 this.findDirectory.addEventListener("click", this, false); 17 this.findDirectory.addEventListener("click", this, false);
18 this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); 18 this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
19 this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false); 19 this.addPropertyChangeListener("newFileDirectory.value", this.handleNewFileDirectoryChange, false);
20 this.newFileDirectory.element.addEventListener("keyup", this, false); 20 this.newFileDirectory.element.addEventListener("keyup", this, false);
21 } 21 }
22 }, 22 },
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index 3ac38d02..e8a699cc 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -22,7 +22,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
22 value: function() { 22 value: function() {
23 this.fileInputField.selectDirectory = true; 23 this.fileInputField.selectDirectory = true;
24 24
25 this.addEventListener("change@newFileName.value", this.newFileNameChange, false); 25 this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);
26 this.newFileName.element.addEventListener("keyup", this, false); 26 this.newFileName.element.addEventListener("keyup", this, false);
27 this.newFileName.element.focus(); 27 this.newFileName.element.focus();
28 this.newFileName.element.select(); 28 this.newFileName.element.select();
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index e2f50ff5..a27d9d13 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -57,7 +57,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
57 this.fileInputField.selectDirectory = true; 57 this.fileInputField.selectDirectory = true;
58 this.fileInputField.pickerName = "saveAsDirectoryPicker"; 58 this.fileInputField.pickerName = "saveAsDirectoryPicker";
59 59
60 this.addEventListener("change@newFileName.value", this.handleNewFileNameChange, false); 60 this.addPropertyChangeListener("newFileName.value", this.handleNewFileNameChange, false);
61 this.newFileName.element.addEventListener("keyup", this, false); 61 this.newFileName.element.addEventListener("keyup", this, false);
62 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false); 62 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
63 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false); 63 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 49960f58..243caf5c 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -67,7 +67,7 @@ exports.KeyboardMediator = Montage.create(Component, {
67 document.addEventListener("keydown", this, false); 67 document.addEventListener("keydown", this, false);
68 document.addEventListener("keyup", this, false); 68 document.addEventListener("keyup", this, false);
69 <