aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
|\ | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules
| * Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| |
| * Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| |
| * Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| |
| * Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| |
| * Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29
| |
* | Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
|\ \
| * \ Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
| |\ \ | | |/ | |/| Styles Controller - Fix specificity comparison in hasGreaterSpecificity
| | * Styles Controller - removing console logsEric Guzman2012-06-29
| | |
| | * Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
| | |
| * | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \ | | | | | | | | Presets/CSS Panel - Update css panel with preset class.
| | * | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | | |
| * | | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
| |\ \ \ | | |/ / | |/| | Gio binding view bugs and fixes
| | * | Binding View - Multi document bug : cleared object bindings when current ↵Armen Kesablyan2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | document is changed Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-06-27
| | |\| | | | | | | | | | | | | Bindables_GIO
| | * | Binding HUD - Show promoted PI properties at top of listEric Guzman2012-06-27
| | | |
* | | | Need to special case linear gradient, radial gradient and uber materials ↵Nivesh Rajbhandari2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | when applying fill and stroke colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Fixed not being able to draw linear and radial gradients. Also fixed ↵Nivesh Rajbhandari2012-06-28
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following: commit 7cad082c89911d34a99feeef8e91d22b89cae8f1 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:52:07 2012 -0700 Fix for not being able to draw linear and radial gradient materials. I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit d0df8a2bff052d855bafb7885792b1dfff8eab7d Merge: 2c67d26 b4b54f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:50:11 2012 -0700 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 2c67d264851f0897fdca8ca887c1c82d0e434217 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 15:06:13 2012 -0700 IKNINJA-1721 - File dirty marker does not show when modifying elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 11:15:34 2012 -0700 IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
|\ \ \ | | |/ | |/|
| * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
| |\|
| * | 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>
| * | | refactored to move bindings to templateAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | fixed code hinting and autocompletion bugAnanya Sen2012-06-26
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-27
|\ \ \ \ | | |_|/ | |/| |
| * | | Styles Controller - Remove debuggerEric Guzman2012-06-26
| | | |
| * | | Styles Controller - Chrome 20 FixEric Guzman2012-06-26
| | |/ | |/|
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
|\| |
| * | Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ \ | | |/ | |/| Binding View - Binding Tool & Binding Panel
| | * Binding View - Objects Replace existing source Object if it existsArmen 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-21
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\ \ \
| | * | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | |
| | * | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-19
| | |\ \ \ \
| | | * | | | Binding View - Mouse Over Element Pop up HudArmen Kesablyan2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Objects Tray - Show only "off stage" objectsEric Guzman2012-06-19
| | |/ / / /
| | * | | | 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>
| | * | | | | Objects Controller - Fix call to get current object bindings after ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add/removing binding
| | * | | | | Objects Controller - Update current object bindings when adding/removing ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bindings
| | * | | | | Objects Controller - Add concept of categoriesEric Guzman2012-06-12
| | | | | | |
| | * | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| | |\ \ \ \ \
| | | * | | | | 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>
| | * | | | | | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| | |/ / / / / /
| | * | | | | | Controller - Allow currentBindings to update by resetting currentObjectEric Guzman2012-06-11
| | | | | | | |
| | * | | | | | Binding Panel - Direction toggle changes are savable.Eric Guzman2012-06-10
| | | | | | | |
| | * | | | | | Changes to Binding ViewArmen Kesablyan2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>