Changeset 4434

Timestamp:

Mar 8, 2013, 9:03:50 AM (10 years ago)

Author:

olle

Message:

Refs #799. Proteios SE updated to allow id, ondragstart, onMousedown, and onMouseup attributes to be set for an HTML image element.

Location:

trunk

Files:

• api/waf/src/se/lu/thep/waf/dom/html/Img.java (modified) (1 diff)
• client/servlet/src/org/proteios/gui/Image.java (modified) (2 diffs)
• client/servlet/src/org/proteios/gui/web/GUIConverter.java (modified) (2 diffs)

trunk/api/waf/src/se/lu/thep/waf/dom/html/Img.java

@@ -35 +35 @@
     extends Tag<Img>
 {
+  public Img setOnDragstart(String onDragstart)
+  {
+    this.setAttribute(new Attribute("ondragstart", onDragstart));
+    return this;
+  }
+
+
+  public Img setOnMousedown(String onMousedown)
+  {
+    this.setAttribute(new Attribute("onMousedown", onMousedown));
+    return this;
+  }
+
+
+  public Img setOnMouseup(String onMouseup)
+  {
+    this.setAttribute(new Attribute("onMouseup", onMouseup));
+    return this;
+  }
+
+
   public Img setSrc(String src)
   {

trunk/client/servlet/src/org/proteios/gui/Image.java

@@ -40 +40 @@
   private Integer height = 0;
   private ImageMap imageMap = null;
+  private String id = null;
+  private String onDragstartStr = null;
+  private String onMousedownStr = null;
+  private String onMouseupStr = null;
   /**
    * If true draw a kind of frame around this image
@@ -120 +124 @@
     this.imageMap = imageMap;
   }
+
+
+  public String getId()
+  {
+    return this.id;
+  }
+
+
+  public void setId(String id)
+  {
+    this.id = id;
+  }
+
+
+  public String getOnDragstartStr()
+  {
+    return this.onDragstartStr;
+  }
+
+
+  public void setOnDragstartStr(String onDragstartStr)
+  {
+    this.onDragstartStr = onDragstartStr;
+  }
+
+
+  public String getOnMousedownStr()
+  {
+    return this.onMousedownStr;
+  }
+
+
+  public void setOnMousedownStr(String onMousedownStr)
+  {
+    this.onMousedownStr = onMousedownStr;
+  }
+
+
+  public String getOnMouseupStr()
+  {
+    return this.onMouseupStr;
+  }
+
+
+  public void setOnMouseupStr(String onMouseupStr)
+  {
+    this.onMouseupStr = onMouseupStr;
+  }
 }

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -162 +162 @@
         Img imgT;
         Boolean useFrame;
+        if (img.getId() != null && !img.getId().equals(""))
+        {
+          imgId = img.getId();
+        }
+        else
+        {
+            imgId = "img" + r.nextInt(10);
+        }
         // static source is used unless ViewAction is set
-        imgId = "img" + r.nextInt(10);
         imgSrc = imagePath + img.getStaticSrc();
         viewAction = img.getViewAction();
@@ -185 +192 @@
         // First we show the loading img
         imgT.setSrc(loadingImgSrc);
+        // Set optional ondragstart function
+        if (img.getOnDragstartStr() != null && !img.getOnDragstartStr().equals(""))
+        {
+          imgT.setOnDragstart(img.getOnDragstartStr());
+        }
+        // Set optional onMousedown function
+        if (img.getOnMousedownStr() != null && !img.getOnMousedownStr().equals(""))
+        {
+          imgT.setOnMousedown(img.getOnMousedownStr());
+        }
+        // Set optional onMouseup function
+        if (img.getOnMouseupStr() != null && !img.getOnMouseupStr().equals(""))
+        {
+          imgT.setOnMouseup(img.getOnMouseupStr());
+        }
         //
         if (img.getImageMap() != null && img.getImageMap().getImageMapAreaList() != null)