Merge remote-tracking branch 'upstream/master'

2015-07-02 13:14:27 -07:00
parent 73241efdc8 4c77dd6a69
commit 07c907b315
4 changed files with 15 additions and 14 deletions
--- a/platform/features/imagery/src/directives/MCTBackgroundImage.js
+++ b/platform/features/imagery/src/directives/MCTBackgroundImage.js
@@ -64,7 +64,7 @@ define(

                    if (!url) {
                        loaded = myCounter;
-                        element.css('background-image', undefined);
+                        element.css('background-image', 'none');
                    } else {
                        image = $document[0].createElement('img');
                        image.src = url;
--- a/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
+++ b/platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
@@ -92,7 +92,7 @@ define(

                expect(mockElement.css.mostRecentCall.args).toEqual([
                    "background-image",
-                    undefined
+                    "none"
                ]);
            });
        });