| Commit message (Collapse) | Author | Age |
|
|
|
| |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|
|
|
| |
This now re-renders the design view when switching from code view. There are many outstanding issues, the Time-Line completely breaks and blocks Ninja, it is unknown why, there are too many dependencies. To make it work, we disabled that feature, although this check in does not include that, so it can be fixed proper. Also, the document controller creates a new tab per switch as it does not check that it is the same document. That bug must also be fixed. Finally, we need to hook up a new code view to the document, the current code view will not work as desired, so a new code view must be built and implemented.
|
|
|
|
| |
This now let's you switch between code and design views in all documents opened that support design view. Code view for these documents is currently unsupported, so this is just to hook up the UI to the new methods. Code view will be added next.
|
|
|
|
| |
Added a method to switch views from code and design. (Code is not currently supported)
|
| |
|
|
|
|
|
|
|
| |
Was lower-case. Now upper-case.
Also fixed BOMs, trailing white-space, DOS line terminators. Did not
expand tabs to spaces.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| | |
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| | |
|
|\| |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI.
|
| |
| |
| |
| | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
longer in view.
Also pausing videos when switching documents.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\
| | |
| | | |
Binding View - Binding Tool & Binding Panel
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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>
|
| | | | |
| | | | |
| | | | |
| | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | | | | |
|
| | |\ \ \ \ |
|
| | | |\ \ \ \ |
|
| | |\| | | | | |
|
| | | |\ \ \ \ \ |
|
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
including added components
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
|/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
|\ \ \ \ \ \ \ \
| |_|_|_|_|_|_|/
|/| | | | | | | |
Make stage transparent when rotating/zooming templates and draw an outline around the user's root instead.
|
| | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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>
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixes an issue with files located in folder with names/paths that the browser escapes, hence, caused a bug with the path passed to the cloud simulator and files not to be found. This does not require testing to merge.
The fix is simple, addresses folder paths with spaces and such characters in which CSS files consumed by the HTML we open in design view.
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | | |
IKNINJA-1746 - Can't select items behind the banner templates' viewport.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
publish/save.
Missed the banner and animation case in the previous checkin.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixes issue with removing styles from other elements. This now only applies to HTML and Body tags
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
I/O step in template.
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
get saved out with the document.
This still requires some changes by Jose.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \ \ \ \ |
|
| |\ \ \ \ \ \ |
|
| | |_|_|_|_|/
| < |