aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-22
|\
| * fixing the undefined 'color' issueValerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the selection in multiple documents and some code cleanupValerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
* Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-22
|\ | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Updates for WebGL/Canvas 2D authortime and runtime gradients.hwc4872012-05-18
| |
| * canvas 2d radial gradient render problem.hwc4872012-05-17
| |
| * Linear & radial gradients for runtime fixeshwc4872012-05-17
| |
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-17
| |\
| * | Gradient matching between WebGL and Canvas2Dhwc4872012-05-15
| | |
| * | base canvas 2d rendering of radial gradient on size of the filled region onlyhwc4872012-05-14
| | |
| * | removed console output.hwc4872012-05-14
| | |
| * | Drag plane not being set. Injection from a recent checkin of mine.hwc4872012-05-14
| | |
| * | removed some console output.hwc4872012-05-14
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| |\ \
| * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-10
| |\ \ \ \
| * | | | | Fixed an inaccuracy snapping to the stage.hwc4872012-05-10
| | | | | |
| * | | | | code cleanup for linear gradients.hwc4872012-05-08
| | | | | |
| * | | | | WebGL linear gradients to match CSShwc4872012-05-08
| | | | | |
| * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-08
| |\ \ \ \ \
| * | | | | | Radial gradients to match CSShwc4872012-05-08
| | | | | | |
* | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js
| * | | | | | | fixing a few document switching issues.Valerio Virgillito2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | - fixed save asAnanya Sen2012-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-21
| |\ \ \ \ \ \ \
| * | | | | | | | - added opening multiple code and design view documentsAnanya Sen2012-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | use documents parent container propertyAnanya Sen2012-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | save for code view documents in the new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
| |\ \ \ \ \ \ \ \
| * | | | | | | | | integrated open code view document in new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | Bumping RDGE version numberJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to ensure there are no conflicts with older working files.
* | | | | | | | | | Maintain I/O webGL mode fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping data in-file if a data tag is detected.
* | | | | | | | | | Minor bug fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE.
* | | | | | | | | | Adding support for reading webgl external filesJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For author-time, run-time is already checked in and supported.
* | | | | | | | | | 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.
* | | | | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-21
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-18
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | | | | | | | | fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Fixing button controls in the Properties Panel for changes in montage v.10 ↵Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawing. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>