aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* removed using montage button, since it has changed in Montafe 0.6Ananya Sen2012-02-03
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-03
|\ | | | | | | | | | | | | | | | | Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Chrome FileSystem API TestingJose Antonio Marquez2012-02-02
| | | | | | | | Doing benchmark testing of the native HTML5 FileSystem API available in Chrome. Need to run testing of local XHR requests and also getting files from packaged app.
| * Removing reference to Ninja UtilsJose Antonio Marquez2012-02-02
| | | | | | | | This was removed, will need to check was it affects. Also added the removed checking script on Ninja didDraw to prompt user for cloud simulator.
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| | * Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| | |\
| | | * Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
| | | * upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Fixes for montage integrationValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Fixes for montage integrationValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-02-02
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | IKNINJA-1083Jose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| | | * | Fixing the bread-crumb backgroundValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| | |\ \ \ | | | | | | | | | | | | Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
| | | * | | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Adding legal attribution for decompose matrix routine.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Support stage in PI's 3d section.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Merging Jose's colorchip change.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | | * | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | | * | | Adding a version json object to NinjaValerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | | * | | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | | | | |
| | | * | | Forgot to remove a require in previous checkin.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Removing unused Properties3D file since those values are now saved with the ↵Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | models. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fixed grid not drawing bug when switching from front to top and side.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Delete unneeded compass log file (IKNINJA 1101).Jon Reid2012-02-01
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default.
| | * | | IKNINJA-1083Jose Antonio Marquez2012-02-01
| | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| * | | | Setting up mediator for UI in FileIOJose Antonio Marquez2012-02-02
| | | | |
* | | | | removed usage of NJUtils.js as it is being deleted.Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | integrated new file dialog with the template descriptor.json and ↵Ananya Sen2012-02-02
|/ / / / | | | | | | | | | | | | | | | | | | | | document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | uri validation moved to file io apisAnanya Sen2012-02-02
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-02
|\ \ \ \
| * | | | File IO clean up and setting upJose Antonio Marquez2012-02-01
| | | | | | | | | | | | | | | | | | | | Cleaned up file IO templates and removed app-caching from Ninja since it would be needed. Setting up io-mediator to hook up to controller. Still need to address naming conventions and clean up more in the io directory.
| * | | | Adding cancel functionality to cloud popupJose Antonio Marquez2012-02-01
| | | | | | | | | | | | | | | | | | | | Added the functionality to the cloud pupup cancel button to set the rootURL to null if selected, ok button will allow the value to remain as last input. Test button tests the URL, and therefore set it, but does not handling closing the dialog.
| * | | | Updating after merge with other FileIO branchJose Antonio Marquez2012-02-01
| | | | |
| * | | | Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-01
| |\ \ \ \
| * | | | | Removing filesytem class, no longer usedJose Antonio Marquez2012-02-01
| | | | | | | | | | | | | | | | | | | | |