aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
* Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
|\ | | | | Draw stage left and top references lines. Also fixed IKNinja-1720.
| * IKNINJA-1720 - Object in a document erases 3D grid in other document when ↵Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | switching with document tabs. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
|\|
| * updating the components and descriptor.json to support montage v.11Valerio Virgillito2012-06-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\|
| * IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
|\ \ \ | | |/ | |/|
| * | removing console logValerio Virgillito2012-06-11
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | 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>
* | | - removed extra selection change event,Ananya Sen2012-06-11
|/ / | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge pull request #274 from ananyasen/bugfix-masterValerio Virgillito2012-06-06
|\ \ | | | | | | Bugfix master
| * | IKNINJA-1662 - fixed js error while resizing brewing in code viewAnanya Sen2012-06-05
| |/ | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* / handle switching between multiple documents for Pen tool by having its own ↵Pushkar Joshi2012-06-05
|/ | | | selection change handler
* Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
|\ | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@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 the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #5 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-31
| |\ | | | | | | Fixing stage's scroll offsets when switching between documents.
| * | removing the stage view component as it is not used anymoreValerio Virgillito2012-05-31
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | SnapManager.setupDragPlaneFromPlane must happen after StylesController has ↵Nivesh Rajbhandari2012-06-01
| |/ |/| | | | | | | | | finished initializeRootStyles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing scroll offsets when switching between documents.Nivesh Rajbhandari2012-05-31
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Removing unused scroll model save/restore.Nivesh Rajbhandari2012-05-31
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* fixing the switching between various types of documentsValerio Virgillito2012-05-31
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* removing the last closeDocument handlerValerio Virgillito2012-05-31
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding back the stage references in the 3d classes.Nivesh Rajbhandari2012-05-31
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* remove current document binding from the stage depsValerio Virgillito2012-05-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵Valerio Virgillito2012-05-30
|\ | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fix for snap-align not working correctly after resizing the stage.Nivesh Rajbhandari2012-05-30
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixed bug with scrolling too much when moving objects in negative space.Nivesh Rajbhandari2012-05-29
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Moving layout and stageDeps' handleOpenDocument into stage.Nivesh Rajbhandari2012-05-29
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Sped up user-interaction by moving grid drawing into its own canvas so the ↵Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | layout code doesn't have to be run when modifying selected elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Don't loop through layout drawing code if layout view is off.Nivesh Rajbhandari2012-05-24
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Fixing the close document.Valerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| | | | | | | | 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>
* 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
| * 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 selection bug when switching/opening documents. Also, use saved scroll ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update stage to handle switching between documents.Nivesh Rajbhandari2012-05-24
| | | | | | | | 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>
* | 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>
* - 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>
* Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
|\
| * fixing a scrolling issue when multiple documents are switchedValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixed a switch documents bug where the layout was getting called before ↵Valerio Virgillito2012-05-18
| | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing some snapping bugsValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>