aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-html.js
Commit message (Collapse)AuthorAge
* BSD LicenseKris Kowal2012-07-09
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* 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>
| * IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* 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 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/master' into document-bindings-fixValerio Virgillito2012-06-01
|\
| * Fixing webGL helperJose Antonio Marquez2012-06-01
| |
* | fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | cleanup itemValerio Virgillito2012-05-31
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing the closing of documentsValerio Virgillito2012-05-30
|/ | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* 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
| * 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>
* | 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
| * fixing a few document switching issues.Valerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Clean up and adding TODOsJose Antonio Marquez2012-05-18
|/
* 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>
* multiple documents - enable opening multiple documents and initial switchingValerio Virgillito2012-05-17
| | | | 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>
* Fixing selection bugs in new templates.Nivesh Rajbhandari2012-05-16
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* document close handler. initial working draftValerio Virgillito2012-05-15
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing banner templateJose Antonio Marquez2012-05-14
| | | | Need to implement save, but this cover open and new.
* Fixing grid drawing bug.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 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.
* Adding partial close functionalityJose Antonio Marquez2012-05-10
|
* Extracting CSS methods to parsing class.Jose Antonio Marquez2012-05-07
| | | | Need to do the same with webGL.
* 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>
* Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
|
* Partial URL parsingJose Antonio Marquez2012-05-02
| | | | Added temporary URL parsing to document assets. (head and body)
* Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | | | Added basic open file functionality, does not parse document for URLs.
* More clean up, updating menu itemsJose Antonio Marquez2012-05-01
|
* 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>
* Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
| | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>