Merge pull request #368 from ChristianMayer/feature_image_shrink_to_fit

New feature for Image widget: shrink to fit width
CometVisu · Aug 21, 2016 · 5c3173b · 5c3173b
2 parents c0976f4 + 4e13779
commit 5c3173b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/structure/pure/Image.js b/src/structure/pure/Image.js
@@ -65,8 +65,8 @@ define( ['_common'], function( design ) {
       if (data.width) {
         imgStyle += 'width:'  + data.width + ';';
       }
-      else {
-        imgStyle += 'width: 100%;';
+      if( $e.attr('widthfit') === 'true' ) {
+        imgStyle += 'max-width:100%;';
       }
       if (data.height) {
         imgStyle += 'height:' + data.height + ';';

diff --git a/src/visu_config.xsd b/src/visu_config.xsd
@@ -1005,9 +1005,10 @@
       <xsd:element name="label" type="label" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
     <xsd:attribute name="src" type="uri" use="required" />
-    <xsd:attribute name="width" type="dimension" />
-    <xsd:attribute name="height" type="dimension" />
-    <xsd:attribute name="refresh" type="xsd:decimal" />
+    <xsd:attribute name="width" type="dimension" use="optional" />
+    <xsd:attribute name="height" type="dimension" use="optional" />
+    <xsd:attribute name="widthfit" type="xsd:boolean" use="optional" />
+    <xsd:attribute name="refresh" type="xsd:decimal" use="optional" />
     <xsd:attribute ref="flavour" use="optional" />
   </xsd:complexType>
 

diff --git a/test/karma/structure/pure/Image-spec.js b/test/karma/structure/pure/Image-spec.js
@@ -28,7 +28,7 @@ define( ['jquery','TemplateEngine', '_common', 'widget_image'], function($, engi
       var data = templateEngine.widgetDataGet('id_0');
       expect(data.path).toBe("id_0");
 
-      expect(widget.find("img").get(0).getAttribute("style")).toBe('width: 100%;');
+      expect(widget.find("img").get(0).getAttribute("style")).toBe('');
 
       image.setAttribute("width", "50%");
       image.setAttribute("height", "51%");
@@ -40,6 +40,13 @@ define( ['jquery','TemplateEngine', '_common', 'widget_image'], function($, engi
       });
       expect(templateEngine.setupRefreshAction).toHaveBeenCalled();
       expect(widget.find("img").get(0).getAttribute("style")).toBe('width:50%;height:51%;');
+
+      image.removeAttribute("width");
+      image.removeAttribute("height");
+      image.removeAttribute("refresh");
+      image.setAttribute("widthfit", "true");
+      widget = $(creator.create(xml.firstChild.firstChild, 'id_0', null, 'image'));
+      expect(widget.find("img").get(0).getAttribute("style")).toBe('max-width:100%;');
     });
   });
 });