aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
...
* | | | | 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>
| * | | | | | cleanup and making the webgl-helper only loop canvas on file saveValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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.
* | | | | fixing a small typoValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
|\ \ \ \ \ | | | | | | | | | | | | Saving Google Components (reel components)
| * | | | | Fixing CSS bugJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | This is for files using 'save' and not 'save all' in which the styles would be thrown off and mixed improperly.
| * | | | | Canvas lib fixJose Antonio Marquez2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O.
| * | | | | 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.
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| |\ \ \ \ \
| * | | | | | Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
| * | | | | | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | | | | |
| * | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| |\ \ \ \ \ \
| * | | | | | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only)
| * | | | | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
* | | | | | | | 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>
* | | | | | | 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
| |/ / / / /
| * | | | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | | | | | | | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| * | | | | Cleaning upJose Antonio Marquez2012-05-30
| | |_|_|/ | |/| | | | | | | | | | | | | Removing obsolete files.
* | | | | fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | 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>
* | | | | cleanup itemValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | cleanup itemsValerio 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>
* | | | | cleanup and handling the document views in the document controller for now.Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge branch 'refs/heads/dom-architecture' into document-bindings-fixValerio Virgillito2012-05-29
|\| | | |
| * | | | Cleaning upJose Antonio Marquez2012-05-27
| | | | |
| * | | | Cleaning upJose Antonio Marquez2012-05-27
| | |_|/ | |/| |
* / | | 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>
* | | 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.
* | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-23
|\| |
| * | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/controllers/styles-controller.js
| * \ \ Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ \ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| * | | | CSS Panel - Add highlight CSS class to template fileEric Guzman2012-05-17
| | |_|/ | |/| |
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
|\ \ \ \ | | |_|/ | |/| |
| * | | 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/master' into dom-architectureValerio Virgillito2012-05-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>