aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
|\ | | | | | | Textures
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * \ Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Removed references to NJUtilshwc4872012-06-12
| | | |
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
| |\ \ \
| | * \ \ Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ \ \ Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | removing all model creators.Valerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| | |_|/ / | |/| | | | | | | | | | | | | Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
| * | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| |\ \ \ \ | | |_|/ / | |/| | | Pentool
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| | |\| |
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | |\ \ \
| | * | | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
| * | | | | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | * | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-05
|\| | | | | | | | | | | | | | | | | | | Textures
| * | | | Adding saving blocking screenJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
| * | | | Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process.
| * | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| |\| | |
| * | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Textures
| * | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\| | |
| * | | | document bindings phase 1Valerio Virgillito2012-05-29
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
|\ \ \ \ | | |/ / | |/| | | | | | Textures
| * | | Fixing CSS overwrite issueJose Antonio Marquez2012-05-30
| | | |
| * | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| |/ / | | | | | | | | | Need to figure out CSS overwrite issue <style>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
|\| | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| | * | Keyboard arrows were not working because some code had not been updated to ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | check updated document model. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | - don't redraw stage for code document - fixes a switching bugAnanya Sen2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix for ctrl+S for code document - disallow opening the panels while in code document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| |/ / | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
| * | Maintain I/O webGL mode fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | Keeping data in-file if a data tag is detected.
| * | Fixing localization bug with webgl external dataJose Antonio Marquez2012-05-21
| | |
| * | Modifying Canvas Data I/OJose Antonio Marquez2012-05-21
| | | | | | | | | | | | Changing methods to save all data to external files, this will be optional for the user. Currently save will only save to external files, but UI will allow user to save in file. Need to implement loading data on file open for external file, only works for in file currently. Modified the Runtime file to load all data itself to not bulk up the user document.
| * | Adding mappings to Google ComponentsJose Antonio Marquez2012-05-21
| | | | | | | | | | | | This is just to add correct mappings to Google Montage components in the package.json file generated.
| * | Fixing save logicJose Antonio Marquez2012-05-18
| | | | | | | | | | | | Moved dirty marker clearing code to model.
| * | Adding component initialization on openJose Antonio Marquez2012-05-17
| | | | | | | | | | | | This is for opening components, selection is still not reflecting component data.
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| |\ \
| | * | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| |\| |
| | * | changing @change to propertyChangeListenerValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixing serialization referencing (new object per save)Jose Antonio Marquez2012-05-16
| | | |
| * | | Fixing reference to serialization tagJose Antonio Marquez2012-05-16
| | | |
| * | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
| |/ / | | | | | | | | | Only for saving basic components without a reel.
| * | Fixing preview bugJose Antonio Marquez2012-05-16
| | | | | | | | | | | | Also setting up for Montage component serialization.
| * | Saving body attributesJose Antonio Marquez2012-05-15
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:23:26 +0000