diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/controllers/elements/image-controller.js | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/controllers/elements/image-controller.js')
| -rwxr-xr-x[-rw-r--r--] | js/controllers/elements/image-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/image-controller.js b/js/controllers/elements/image-controller.js index 5abce13e..25ca8da6 100644..100755 --- a/js/controllers/elements/image-controller.js +++ b/js/controllers/elements/image-controller.js | |||
| @@ -19,7 +19,7 @@ exports.ImageController = Montage.create(ElementController, { | |||
| 19 | return el.getAttribute(prop); | 19 | return el.getAttribute(prop); |
| 20 | break; | 20 | break; |
| 21 | default: | 21 | default: |
| 22 | return ElementController.getProperty(el, prop); | 22 | return ElementController.getProperty(el, prop, true); |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, |