aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
Commit message (Collapse)AuthorAge
* updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* adding more missing propertiesValerio Virgillito2012-06-11
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* adding more missing propertiesValerio Virgillito2012-06-11
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
|\
| * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
|/ | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
|\ | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
* | | Removing the old checkbox components. Created a new LabelCheckboxValerio Virgillito2012-05-16
| |/ |/| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
|/ | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | preparation for montage converting to the new "prototype" format fully
* cleanup unused code.Valerio Virgillito2012-04-19
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * file picker - added size unitAnanya Sen2012-03-22
| | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
|\ | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
| * fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* updated file picker image iconsAnanya Sen2012-03-06
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* We need to remove color buttons from the color model when updating the PI ↵Nivesh Rajbhandari2012-02-28
| | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\
| * Updating textfield to only use nj-skinned class and updating input-group to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | check for nj-skinned class instead of textfield class for styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * | Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error.
| * | Squashed commit of the following:Jose Antonio Marquez2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 302ae3c1812086d976eb67c9cf693c43205f3904 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 11:13:05 2012 -0800 hide the rulers when no document is open Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e766c9eaa98fa20f311b3eb2f892a1a240e90cf Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Thu Feb 16 06:43:33 2012 -0800 file picker: Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 16:09:14 2012 -0800 fixes to document tabbing Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 56d2a8d11a73cd04c7f1bc20d1ded52b9c1242f2 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:38 2012 -0800 Revert "Revert "Creating NinjaTemplate to HTML function"" This reverts commit 2e308be9bec5e06d81b2905b65005a232f0a190d. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:54:14 2012 -0800 Revert "Revert "Reverting text/html document classes and setting up MVC folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit aead95ce4b2571356701229567bfde73d54bed93 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:53:55 2012 -0800 Revert "Revert "Cleaning up"" This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a8d1a2e1f4f4ab7b9298bfbd1b49731785c79c3a Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:56 2012 -0800 Revert "Revert "Merging TextDocument into BaseDocument"" This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit e864dc319805e259b7ae39a9d4d96fac552a1f87 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:52:38 2012 -0800 Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:06:42 2012 -0800 merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit b8782f2e3dd106accbb0160a98e6b498f26752ea Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 10:01:59 2012 -0800 Revert "Merging TextDocument into BaseDocument" This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:58:37 2012 -0800 Revert "Cleaning up" This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 9048cd50bf5e0a418d1d95498bb593961f72db36 Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:51:12 2012 -0800 Revert "Reverting text/html document classes and setting up MVC folder structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> commit 2e308be9bec5e06d81b2905b65005a232f0a190d Author: Ananya Sen <Ananya.Sen@motorola.com> Date: Wed Feb 15 09:50:20 2012 -0800 Revert "Creating NinjaTemplate to HTML function" This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | - file picker - select file on double clickAnanya Sen2012-02-21
| |/ |/| | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | moved file picker in file ioAnanya Sen2012-02-16
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | file picker:Ananya Sen2012-02-16
| | | | | | | | | | | | | | Enable ok if user double clicks folder and enter it. Validate path if user enter it manually in addressbar. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixes to document tabbingAnanya Sen2012-02-15
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Revert "Reverting text/html document classes and setting up MVC ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Revert "Reverting text/html document classes and setting up MVC folder ↵Ananya Sen2012-02-15
|/ | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Reverting text/html document classes and setting up MVC folder structureJose Antonio Marquez2012-02-14
| | | | Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers.
* File IO UI tweaksJose Antonio Marquez2012-02-13
| | | | Making minor tweaks to the UI for file IO, will need to make much more at a later time.
* new file dialog - preselect default templateAnanya Sen2012-02-13
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* added logical drive selection to file pickerAnanya Sen2012-02-13
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
|\
| * Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * initial color chip for the stageValerio Virgillito2012-02-10
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | file open and file new integrated againAnanya Sen2012-02-10
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵Ananya Sen2012-02-09
| | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | removed using montage button, since it has changed in Montafe 0.6Ananya Sen2012-02-03
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | changes to open multiple code view tabs and switch between the code views, ↵Ananya Sen2012-02-02
| | | | | | | | | | | | added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed reference to coreioapiAnanya Sen2012-02-01
| | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | calling coreioapi.js directly since filesystem.js will be deletedAnanya Sen2012-01-30
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 18:22:53 +0000