aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
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>
| * Remove ninja's author-time styles for banner and animation templates on ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | publish/save. Missed the banner and animation case in the previous checkin. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Save user's html and body styles and inline body styles for 3d so they don't ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | 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>
| * Adding support for html and head tags attributesJose Antonio Marquez2012-06-07
| | | | | | | | Both on open and close, Chrome randomly changes order of attributes, so this is browser induced bug.
| * 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>
| | * Cleaning more.Jose Antonio Marquez2012-06-06
| | |
| | * Cleaning upJose Antonio Marquez2012-06-06
| | | | | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
| * | 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>
| * Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| |\
| | * Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| | |\
| | * | cleanup itemsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | cleanup and handling the document views in the document controller for now.Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | |
| * | | Creating template mediator classJose Antonio Marquez2012-06-01
| | |/ | |/| | | | | | | This is to simplify code, more to be changed and added.
| * | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| |/ | | | | | | Need to figure out CSS overwrite issue <style>
* | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-31
|\|
| * Cleaning upJose Antonio Marquez2012-05-27
| |
| * Cleaning upJose Antonio Marquez2012-05-27
| |
* | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-25
|\|
| * Final clean up of render callback for design viewJose Antonio Marquez2012-05-24
| |
| * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| | * Getter for _liveNodeList should return a copy.Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Removed unused variables and methods in stage-deps, layout design, and ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Renaming variable as it will now be usedJose Antonio Marquez2012-05-24
| | | | | | | | | | | | This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates.
| * | 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.
| * | Adding redirect from app folder in templatesJose Antonio Marquez2012-05-22
| |/ | | | | | | This doesn't resolve the issue of XHR requests made in Montage.
* / Objects Controller - Now keeps track of document's object instances, ↵Eric Guzman2012-05-25
|/ | | | including added components
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
|\ | | | | | | | | Conflicts: js/document/document-html.js
| * fixing a few document switching issues.Valerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * - 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>
| * 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>
* | | Minor bug fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE.
* | | Adding support for reading webgl external filesJose Antonio Marquez2012-05-22
| |/ |/| | | | | For author-time, run-time is already checked in and supported.
* | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-18
|\ \ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | Adding component initialization on openJose Antonio Marquez2012-05-17
| | | | | | | | | | | | This is for opening components, selection is still not reflecting component data.
* | | fixing the color chip for the document rootValerio Virgillito2012-05-18
|/ / | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / Adding default padding for banner templates.Nivesh Rajbhandari2012-05-17
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Fixing preview bugJose Antonio Marquez2012-05-16
| | | | Also setting up for Montage component serialization.
* Fixing overflow on open for template documentsJose Antonio Marquez2012-05-15
|
* Finalizing open for new banner templatesJose Antonio Marquez2012-05-15
| | | | Moving to implement save.
* 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 position issueJose Antonio Marquez2012-05-11
| | | | Need to implement centering document.
* Fixing overflow bug for banner templatesJose Antonio Marquez2012-05-11
| | | | Ensuring overflow is visible but saved as hidden.
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 15:08:56 +0000