aboutsummaryrefslogtreecommitdiff
path: root/js/stage/stage.reel
Commit message (Collapse)AuthorAge
* fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
|
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* BSD LicenseKris Kowal2012-07-09
|
* Normalize HTML doctypeKris Kowal2012-07-06
|
* Remove byte order markers (BOM)Kris Kowal2012-07-06
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
|\ | | | | Binding View - Binding Tool & Binding Panel
| * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-25
| | |\
| * | | Bug: Text Tool Breaking canvas space.Armen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | 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>
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | |\ \
| * | | | Binding View - validate over hudsArmen Kesablyan2012-06-18
| | | | | | | | | | | | | | | | | | | | 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>
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| | |\ \ \
| | * | | | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| |\ \ \ \ \
| * \ \ \ \ \ 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>
| * | | | | | | Binding Visual Tool Initial setupArmen Kesablyan2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Merge pull request #338 from mencio/IKNINJA-1615Valerio Virgillito2012-06-26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrollbar
| * | | | | | | | Fix for IKNINJA-1615: Enable mouse up event on top of the user document ↵Valerio Virgillito2012-06-25
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | IKNinja-1688 - Creating a banner file after a code file causes body div to ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shift to the right and has different scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Reclaim negative padding when moving items back into positive direction.
| * | | | | | | When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
|\| | | | | | |
| * | | | | | | updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\| | | | | |
| * | | | | | IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | 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>
| * | | | | | | 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>
* | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / | | | | - removed extra selection change event,Ananya Sen2012-06-11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
|\ \ \ \ \ | | | | | | | | | | | | Bugfix master
| * | | | | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* / / / / handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
|/ / / / | | | | | | | | | | | | selection change handler
* | | | Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #5 from mqg734/dom-architecture-pentoolValerio Virgillito