aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update copyright boilerplateKris Kowal2012-07-06
| |
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
|\|
| * fixing someValerio Virgillito2012-06-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Preventing video playback on openJose Antonio Marquez2012-06-28
| | | | | | | | This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI.
| * Fix live preview animation lockJonathan Duran2012-06-27
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-27
| |\
| * | Fix element getting stuck with live preview modeJonathan Duran2012-06-27
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Performance fix for WebGL materials playing even when the dialog/file is no ↵Nivesh Rajbhandari2012-06-27
| |/ |/| | | | | | | | | | | | | longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
|\| | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ | | | | | | Binding View - Binding Tool & Binding Panel
| | * Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Edit View - Add buttons and calls controller (saves bindings)Eric Guzman2012-06-11
| | | | | |
| | * | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-31
| | |\ \ \ \
| | | * \ \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-05-30
| | | |\ \ \ \
| | * | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-25
| | |\| | | | |
| | | * | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | | |\ \ \ \ \
| | * | | | | | | Objects Controller - Now keeps track of document's object instances, ↵Eric Guzman2012-05-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | including added components
| | * | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | | refactored to move bindings to templateAnanya Sen2012-06-26
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge pull request #332 from mqg734/ViewPortHackValerio Virgillito2012-06-25
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Make stage transparent when rotating/zooming templates and draw an outline around the user's root instead.
| * | | | | | | Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / | | | | | Support for browser escaped file paths (CSS)Jose Antonio Marquez2012-06-23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with files located in folder with names/paths that the browser escapes, hence, caused a bug with the path passed to the cloud simulator and files not to be found. This does not require testing to merge. The fix is simple, addresses folder paths with spaces and such characters in which CSS files consumed by the HTML we open in design view.
* | | | | | Merge pull request #309 from mqg734/IKNinja_1746Valerio Virgillito2012-06-18
|\ \ \ \ \ \ | | | | | | | | | | | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.
| * | | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Remove ninja's author-time styles for banner and animation templates on ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | publish/save. Missed the banner and animation case in the previous checkin. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Moving location to copy body style attributeJose Antonio Marquez2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with removing styles from other elements. This now only applies to HTML and Body tags
* | | | | | | Adding clean up for ninja style attributes.Jose Antonio Marquez2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I/O step in template.
* | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ↵Nivesh Rajbhandari2012-06-14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| |\ \ \ \ \ \
| * | | | | | | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
* | | | | | | fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| |/ / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
|\| | | | |
| * | | | | Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| |\ \ \ \ \ | | | | | | | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | |\ \ \ \ \
| | * | | | | | Overriding scrollbar styles on the template so the scroll track is not ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files.
| * | | | | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| |/ / / / / | | | | | | | | | | | | | | | | |