svn commit: r1370894 - in /incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer: Gadget.css GadgetWidget.java

[yurize]

Author: yurize
Date: Wed Aug  8 18:57:07 2012
New Revision: 1370894

URL: http://svn.apache.org/viewvc?rev=1370894&view=rev
Log:
Sets default gadget width to 100%. By Vicente J. Ruiz Jurado.
https://reviews.apache.org/r/6340

Modified:
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css
    
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css?rev=1370894&r1=1370893&r2=1370894&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/Gadget.css
 Wed Aug  8 18:57:07 2012
@@ -15,6 +15,7 @@
 .inline {
   display: inline-block;
   vertical-align: bottom;
+  width: 100%;
 }
 
 .title {

Modified: 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
URL: 
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java?rev=1370894&r1=1370893&r2=1370894&view=diff
==============================================================================
--- 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
 (original)
+++ 
incubator/wave/trunk/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
 Wed Aug  8 18:57:07 2012
@@ -82,7 +82,7 @@ public class GadgetWidget extends Observ
 
   private static final String GADGET_RELAY_PATH = 
"gadgets/files/container/rpc_relay.html";
   private static final int DEFAULT_HEIGHT_PX = 100;
-  private static final int DEFAULT_WIDTH_PX = 600;
+  private static final String DEFAULT_WIDTH = "99%";
 
   /**
    * Helper class to analyze element changes in the gadget state and prefs.
@@ -939,7 +939,7 @@ public class GadgetWidget extends Observ
     if (width > 0){
       setIframeWidth(String.valueOf(width));
     } else {
-      setIframeWidth(String.valueOf(DEFAULT_WIDTH_PX));
+      setIframeWidth(DEFAULT_WIDTH);
     }
   }
 
@@ -1340,13 +1340,21 @@ public class GadgetWidget extends Observ
       return;
     }
     log("Set IFrame width ", width);
-    try {
-      int widthValue = parseSizeString(width);
-      ui.setIframeWidth(widthValue + "px");
+    if (width.contains("%")) {
+      ui.setIframeWidth(width);
       ui.makeInline();
-      scheduleGadgetAttributeUpdate(LAST_KNOWN_WIDTH_ATTRIBUTE, 
Long.toString(widthValue));
-    } catch (NumberFormatException e) {
-      log("Invalid width (ignored): ", width);
+      scheduleGadgetAttributeUpdate(LAST_KNOWN_WIDTH_ATTRIBUTE, width);
+    } else {
+      try {
+        int widthValue = parseSizeString(width);
+        if (widthValue > 0) {
+          ui.setIframeWidth(widthValue + "px");
+        }
+        ui.makeInline();
+        scheduleGadgetAttributeUpdate(LAST_KNOWN_WIDTH_ATTRIBUTE, 
Long.toString(widthValue));
+      } catch (NumberFormatException e) {
+        log("Invalid width (ignored): ", width);
+      }
     }
   }