aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-12 12:00:07 -0700
committerNivesh Rajbhandari2012-03-12 12:00:07 -0700
commit2c6339a9191033c937c2bac3e181c2bc380f4c48 (patch)
treef5b6b66c578d77f3db3373ff9521519d107fc33a /js/mediators
parente44238821c6b19a4b2259d26e14847b9995338f2 (diff)
downloadninja-2c6339a9191033c937c2bac3e181c2bc380f4c48.tar.gz
Fixed element mediator, PI, and eye-dropper to handle different borders sides and gradients.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/mediators')
-rwxr-xr-xjs/mediators/element-mediator.js15
1 files changed, 2 insertions, 13 deletions
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 127f73e1..d62fa1f8 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -459,13 +459,12 @@ exports.ElementMediator = Montage.create(NJComponent, {
459 459
460 //-------------------------------------------------------------------------------------------------------- 460 //--------------------------------------------------------------------------------------------------------
461 // Routines to get/set color 461 // Routines to get/set color
462 // for now just return the bg/fill color
463 getColor: { 462 getColor: {
464 value: function(el, isFill) { 463 value: function(el, isFill, borderSide) {
465 if(!el.elementModel) { 464 if(!el.elementModel) {
466 NJUtils.makeModelFromElement(el); 465 NJUtils.makeModelFromElement(el);
467 } 466 }
468 return el.elementModel.controller["getColor"](el, isFill); 467 return el.elementModel.controller["getColor"](el, isFill, borderSide);
469 } 468 }
470 }, 469 },
471 470
@@ -621,16 +620,6 @@ exports.ElementMediator = Montage.create(NJComponent, {
621 } 620 }
622 }, 621 },
623 622
624 getColor2: {
625 value: function(el, prop, mutator) {
626 if(!el.elementModel) {
627 NJUtils.makeModelFromElement(el);
628 }
629
630 return this.getColor(el, (prop === "background"));
631 }
632 },
633
634 //-------------------------------------------------------------------------------------------------------- 623 //--------------------------------------------------------------------------------------------------------
635 // Routines to get/set 3D properties 624 // Routines to get/set 3D properties
636 get3DProperty: { 625 get3DProperty: {