aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\
| * Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
| |\ | | | | | | Reclaim negative padding when moving items back into positive direction.
| | * When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | | | | | | | Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Fixing alpha binding bugJose Antonio Marquez2012-06-25
| | | | | | | | | | | | The chip popup alpha sliders were binding to the panel when they shouldn't, so added a check.
* | | Fixing bottom hit test for popupJose Antonio Marquez2012-06-25
| | | | | | | | | | | | This address clicking outside (below) and closing the popup. The wrong value was being used.
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| |
| * | Merge pull request #333 from mencio/IKNINJA-1394Valerio Virgillito2012-06-25
| |\ \ | | | | | | | | Fixing our textfield component to support binding. Fix for IKNINJA-1394
| | * | Fixing our textfield component to support binding. Fix for IKNINJA-1394Valerio Virgillito2012-06-22
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Cleaning up eventsJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | Adding/Removing events when only needed by color popups.
* | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
|\| | |
| * | | Merge pull request #332 from mqg734/ViewPortHackValerio Virgillito2012-06-25
| |\ \ \ | | | | | | | | | | Make stage transparent when rotating/zooming templates and draw an outline around the user's root instead.
| | * | | 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>
| * | | | Merge pull request #334 from joseeight/FileIOValerio Virgillito2012-06-25
| |\ \ \ \ | | | | | | | | | | | | Modifying HTML template
| | * | | | Support for browser escaped file paths (CSS)Jose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | Adding soft resetJose Antonio Marquez2012-06-23
| | |/ / / | | | | | | | | | | | | | | | Adding a soft reset to the HTML file we create, this eliminates the margin/padding added to the page by browsers, and better illustrates what the user sees in Ninja.
| * | | | Merge pull request #330 from ericmueller/MaterialBugFixesValerio Virgillito2012-06-25
| |\ \ \ \ | | |/ / / | |/| | | fixed a small startup issue with the RDGE library.
| | * | | fixed a small startup issue with the RDGE library.hwc4872012-06-22
| | |/ /
* | | | Color Popup Test CandidateJose Antonio Marquez2012-06-25
| | | | | | | | | | | | | | | | Preliminary check in for testing to commence on new color popup functionality.
* | | | Adding support for gradients on chipsJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | Need to handle other color modes, currently only handling HSV and gradients. Working on getting other modes supported. Also, will need clean up color popup manager after completion.
* | | | Adding gradient mode to toolsJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | Tools need to implement using gradients on pre-flight mode, so right now this will only set/get color but will now apply on draw until tools are made to apply color. This should be filed as individual issues per tool.
* | | | Fixing logic for popup value bubblingJose Antonio Marquez2012-06-23
| | | | | | | | | | | | | | | | Only working for HSV, need to implement HEX and gradient
* | | | Deleting obsolete filesJose Antonio Marquez2012-06-23
| | | |
* | | | Added third gradient chip popupJose Antonio Marquez2012-06-22
| | | | | | | | | | | | | | | | Need to add support for gradient events dispatching from standalone chips. Just need to hook up relays for events besides HSV to bubble up.
* | | | Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
| | | | | | | | | | | | | | | | It seems that from-to stops are omitted if using objects with no 0 and/or 100 percent stops, seems like browser induced, but can't confirmed, bug never reported, but this should fix it.
* | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
|\| | |
| * | | Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
| |\ \ \ | | |/ / | |/| | Draw stage left and top references lines. Also fixed IKNinja-1720.
| | * | Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Have to guard against cases when stage lines are parallel to the canvas and ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | | | | | | | the line intersection routine returns null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | 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>
| | * | Draw stage left and top references lines.Nivesh Rajbhandari2012-06-21
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Fix closing logic and init color on chipJose Antonio Marquez2012-06-22
| | | | | | | | | | | | Added improved logic to handle toggling from button the color popup. Also added an init color method for the chip to initialize color in it's popup.
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
|\| |
| * | Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| |\ \ | | |/ | |/| copy cut paste - project phase 1 check in
| | * removed some redundantsAnanya Sen2012-06-21
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| | |\
| | * | - added io api to generate file from binaryAnanya Sen2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | - refactoring and cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \ \
| | * | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ↵Ananya Sen2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different type of object after performing copy-paste on an existing object throws error on console] Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | adding some error handlingAnanya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | IKNINJA-1754Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| | |\ \ \ \ \
| | * | | | | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the ↵Ananya Sen2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text gets pasted on the stage Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵Ananya Sen2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - eric gunman's fix for styles-controller - select the appropriate override ↵Ananya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rule to apply the override style Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>