diff options
| author | Ananya Sen | 2012-02-23 13:52:32 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-23 13:52:32 -0800 |
| commit | ec3d07c2fea4e79c68606234074f43d694982e5b (patch) | |
| tree | dc7c830c361d35c04a4d9b6d55c6c36d7a5d61cd /js/controllers/elements/image-controller.js | |
| parent | 7283884c39df537694b21419a3ea9e3ca7793b4b (diff) | |
| parent | 287a0bad5b774a380ec6c8b3ddf24dc03234e248 (diff) | |
| download | ninja-ec3d07c2fea4e79c68606234074f43d694982e5b.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers/elements/image-controller.js')
| -rwxr-xr-x | 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 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 | }, |