aboutsummaryrefslogtreecommitdiff
path: root/js/document/models
Commit message (Collapse)AuthorAge
* 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 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-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>
| * | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| |/ | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
* / Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Fixing unique ID storeJose Antonio Marquez2012-06-07
|
* Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
|\
| * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@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>
* | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| |/ |/| | | | | Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
* | Cleaning upJose Antonio Marquez2012-06-06
|/ | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
* Adding saving blocking screenJose Antonio Marquez2012-06-04
| | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
* Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process.
* 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
|\
| * Fixing webGL helperJose Antonio Marquez2012-06-01
| |
* | making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | document bindings phase 1Valerio Virgillito2012-05-29
|/ | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
* fixing the selection in multiple documents and some code cleanupValerio Virgillito2012-05-22
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
|\ | | | | | | | | Conflicts: js/document/document-html.js
| * - added opening multiple code and design view documentsAnanya Sen2012-05-21
| | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * use documents parent container propertyAnanya Sen2012-05-20
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * save for code view documents in the new dom architectureAnanya Sen2012-05-18
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
| |\
| * | integrated open code view document in new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Clean up and adding TODOsJose Antonio Marquez2012-05-18
| |/ |/|
* | Fixing save logicJose Antonio Marquez2012-05-18
| | | | | | | | Moved dirty marker clearing code to model.
* | fixing a scrolling issue when multiple documents are switchedValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | enabling basic document switchingValerio Virgillito2012-05-18
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* document controller and stage view code cleanupValerio Virgillito2012-05-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* 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.
* Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-15
|\ | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * Adding special preview for templatesJose Antonio Marquez2012-05-15
| |
* | document close handler. initial working draftValerio Virgillito2012-05-15
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* File save for banner templateJose Antonio Marquez2012-05-15
| | | | Adding file save for templates, completing I/O.
* 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.
* Adding partial close functionalityJose Antonio Marquez2012-05-10
|
* Preliminary Montage Template CleanupJose Antonio Marquez2012-05-09
| | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save.
* fixing the components for the new domValerio Virgillito2012-05-09
| | | | Signed-off-by: Valerio Virgillito <valerio@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...
* Adding Chrome PreviewJose Antonio Marquez2012-05-08
|
* Moving webGL to own helper classJose Antonio Marquez2012-05-07
| | | | Cleaning up webGL for better working files.
* Adding webGL support for opening filesJose Antonio Marquez2012-05-07
| | | | Added I/O for loading webGL on open file. I/O support for saving to come.
* Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
|
* Setting up new architecture for I/OJose Antonio Marquez2012-05-01
|
* Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>