diff options
Diffstat (limited to 'js/mediators/element-mediator.js')
-rwxr-xr-x | js/mediators/element-mediator.js | 15 |
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: { |