aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
Commit message (Collapse)AuthorAge
* 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>
| * 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 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>
| * 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>
| * 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 a small typoValerio Virgillito2012-06-05
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * 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>
* | Edit View - Add buttons and calls controller (saves bindings)Eric Guzman2012-06-11
| |
* | 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>
| * CSS Panel - Add highlight CSS class to template fileEric Guzman2012-05-17
| |
* | Changes to binding viewArmen Kesablyan2012-05-19
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Sharing app data in banner and html templatesJose Antonio Marquez2012-05-17
| | | | Syncing the files to avoid duplicates and ensure consistency.
* Fixed chrome preview for banner templates.Nivesh Rajbhandari2012-05-17
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
|\
| * 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>
| | * Squashed commit of google-components into masterValerio Virgillito2012-05-09
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixing serialization referencing (new object per save)Jose Antonio Marquez2012-05-16
| | |
* | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
|/ / | | | | | | Only for saving basic components without a reel.
* | Fixing preview bugJose Antonio Marquez2012-05-16
| | | | | | | | Also setting up for Montage component serialization.
* | Fixing the package file for the new dom templateValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding special preview for templatesJose Antonio Marquez2012-05-15
| |
* | Fixing banner templateJose Antonio Marquez2012-05-14
| | | | | | | | Need to implement save, but this cover open and new.
* | Viewport for banner templates so content doesn't push through "body".Nivesh Rajbhandari2012-05-14
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing 3d to work in banner templates.Nivesh Rajbhandari2012-05-14
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing position issueJose Antonio Marquez2012-05-11
| | | | | | | | Need to implement centering document.
* | Adding support for new templatesJose Antonio Marquez2012-05-11
| | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
* | Cleaning up templateJose Antonio Marquez2012-05-11
| |
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-08
|\ \
| * | Get clicked element when body is scrolled.Nivesh Rajbhandari2012-05-08
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Adding SAVE for I/OJose Antonio Marquez2012-05-08
|/ / | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up...
* | Fixing body's default styles.Nivesh Rajbhandari2012-05-04
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Adding hack to allow for blank documents to openJose Antonio Marquez2012-05-02
| |
* | Cleaning up templateJose Antonio Marquez2012-05-01
| |
* | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
|/
* Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
|\ | | | | | | https://github.com/mencio/ninja-internal into serialization
| * Added a body controllerValerio Virgillito2012-04-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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
* adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* initial stage web templateValerio Virgillito2012-04-18
| | | | 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>
| * Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Presets Controller - Removing test background from transition classEric Guzman2012-03-27
| |
| * Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
| |\
| * | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | | | | | | | | | panel code
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ | | |/ | |/| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 14:20:43 +0000