aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
Commit message (Collapse)AuthorAge
* show design code editor - first cutAnanya Sen2012-07-23
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* BSD LicenseKris Kowal2012-07-09
|
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\| | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update copyright boilerplateKris Kowal2012-07-06
| |
* | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-02
|\|
| * fixing someValerio Virgillito2012-06-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Preventing video playback on openJose Antonio Marquez2012-06-28
| | | | | | | | This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI.
* | Performance fix for WebGL materials playing even when the dialog/file is no ↵Nivesh Rajbhandari2012-06-27
|/ | | | | | | | longer in view. Also pausing videos when switching documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
|\ | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ | | | | | | Binding View - Binding Tool & Binding Panel
| | * Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * 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>
| | * | 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>
| | * \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-31
| | |\ \ \
| | * \ \ \ Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-05-25
| | |\ \ \ \
| | * | | | | Objects Controller - Now keeps track of document's object instances, ↵Eric Guzman2012-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | including added components
* | | | | | | refactored to move bindings to templateAnanya Sen2012-06-26
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | / Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* | | | 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>
* | | Cleaning upJose Antonio Marquez2012-05-27
| | |
* | | Cleaning upJose Antonio Marquez2012-05-27
| |/ |/|
* | 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.
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 23:44:22 +0000