svn commit: r1577496 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml

[lo...@apache.org]

Author: lofwyr
Date: Fri Mar 14 11:51:14 2014
New Revision: 1577496

URL: http://svn.apache.org/r1577496
Log:
TOBAGO-1373 - Better JavaScript logging: using browser console and fill browser gaps.
 - backport from 3.0

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java?rev=1577496&r1=1577495&r2=1577496&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java Fri Mar 14 11:51:14 2014
@@ -53,6 +53,7 @@ public class Style implements Serializab
   private Measure paddingBottom;
   private Measure padding;
   private String backgroundImage;
+  private String backgroundPosition;
   private Integer zIndex;
   private TextAlign textAlign;
 
@@ -79,6 +80,7 @@ public class Style implements Serializab
     this.paddingBottom = map.paddingBottom;
     this.padding = map.padding;
     this.backgroundImage = map.backgroundImage;
+    this.backgroundPosition = map.backgroundPosition;
     this.zIndex = map.zIndex;
     this.textAlign = map.textAlign;
   }
@@ -236,6 +238,11 @@ public class Style implements Serializab
       buf.append(backgroundImage);
       buf.append(';');
     }
+    if (backgroundPosition != null) {
+      buf.append("background-position:");
+      buf.append(backgroundPosition);
+      buf.append(';');
+    }
     if (zIndex != null) {
       buf.append("z-index:");
       buf.append(zIndex);
@@ -347,6 +354,11 @@ public class Style implements Serializab
       buf.append(backgroundImage);
       buf.append("\",");
     }
+    if (backgroundPosition != null) {
+      buf.append("\"backgroundPosition\":\"");
+      buf.append(backgroundPosition);
+      buf.append("\",");
+    }
     if (zIndex != null) {
       buf.append("\"zIndex\":");
       buf.append(zIndex);
@@ -518,6 +530,14 @@ public class Style implements Serializab
     this.backgroundImage = backgroundImage;
   }
 
+  public String getBackgroundPosition() {
+    return backgroundPosition;
+  }
+
+  public void setBackgroundPosition(String backgroundPosition) {
+    this.backgroundPosition = backgroundPosition;
+  }
+
   public Integer getZIndex() {
     return zIndex;
   }

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1577496&r1=1577495&r2=1577496&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Fri Mar 14 11:51:14 2014
@@ -388,6 +388,7 @@
         <script name="script/jquery-ui-1.10.3.custom.js"/>
         <script name="script/tobago.js"/>
         <script name="script/tobago-calendar.js"/>
+        <script name="script/tobago-console.js"/>
         <script name="script/tobago-converter.js"/>
         <script name="script/tobago-in.js"/>
         <script name="script/tobago-menu.js"/>