aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | displace pasted object only if the position is absoluteAnanya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\| | | | | | | | | | |
| * | | | | | | | | | | 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>
* | | | | | | | | | | patse raw image data to stageAnanya Sen2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@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 branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
|\| | | | | | | | | |
| * | | | | | | | | | 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>
| | * | | | | | | | | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | 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>
| * | / | | | | | | | | 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>
| * | | | | | | | | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | fixing the save asValerio Virgillito2012-06-05
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Saving Google Components (reel components)
| | * | | | | | | | Fixing saveAll from menuJose Antonio Marquez2012-06-04
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken, not sure when it broke, but working again.
| * / / / / / / / components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | cut/paste for canvas objects and for multiple selected objects of mixed typesAnanya Sen2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| * | | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\ \ \ \ \ \ |