Author: solomax
Date: Thu Jan 21 06:55:32 2016
New Revision: 1725878
URL: http://svn.apache.org/viewvc?rev=1725878&view=rev
Log:
[OPENMEETINGS-1295] profile image is immediately updated in FF
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Thu Jan 21 06:55:32 2016
@@ -43,7 +43,6 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class GenerateImage extends BaseConverter {
-
private static final Logger log =
Red5LoggerFactory.getLogger(GenerateImage.class, webAppRootKey);
@Autowired
@@ -140,5 +139,4 @@ public class GenerateImage extends BaseC
inputFile, outputfile };
return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth", argv);
}
-
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
Thu Jan 21 06:55:32 2016
@@ -27,15 +27,19 @@ import org.apache.wicket.markup.html.Web
public class ProfileImagePanel extends BasePanel {
private static final long serialVersionUID = 1L;
- protected final WebMarkupContainer profile;
+ protected final WebMarkupContainer profile = new
TransparentWebMarkupContainer("profile");
+ private final long userId;
public ProfileImagePanel(String id, final long userId) {
super(id);
-
- profile = new TransparentWebMarkupContainer("profile");
- profile.add(new WebMarkupContainer("img").add(
+ this.userId = userId;
+ add(profile.setOutputMarkupId(true));
+ update();
+ }
+
+ public void update() {
+ profile.addOrReplace(new WebMarkupContainer("img").add(
AttributeModifier.append("alt",
Application.getString(5L))
, AttributeModifier.append("src",
getUrl(getRequestCycle(), userId))));
- add(profile.setOutputMarkupId(true));
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Thu Jan 21 06:55:32 2016
@@ -85,6 +85,7 @@ public class UploadableProfileImagePanel
//TODO display error
}
}
+ update();
target.add(profile, form);
}
});
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Thu Jan 21 06:55:32 2016
@@ -43,7 +43,6 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class GenerateImage extends BaseConverter {
-
private static final Logger log =
Red5LoggerFactory.getLogger(GenerateImage.class, webAppRootKey);
@Autowired
@@ -140,5 +139,4 @@ public class GenerateImage extends BaseC
inputFile, outputfile };
return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth", argv);
}
-
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
Thu Jan 21 06:55:32 2016
@@ -27,15 +27,19 @@ import org.apache.wicket.markup.html.Web
public class ProfileImagePanel extends BasePanel {
private static final long serialVersionUID = 1L;
- protected final WebMarkupContainer profile;
+ protected final WebMarkupContainer profile = new
TransparentWebMarkupContainer("profile");
+ private final long userId;
public ProfileImagePanel(String id, final long userId) {
super(id);
+ this.userId = userId;
+ add(profile.setOutputMarkupId(true));
+ update();
+ }
- profile = new TransparentWebMarkupContainer("profile");
- profile.add(new WebMarkupContainer("img").add(
+ public void update() {
+ profile.addOrReplace(new WebMarkupContainer("img").add(
AttributeModifier.append("alt",
Application.getString(5L))
, AttributeModifier.append("src",
getUrl(getRequestCycle(), userId))));
- add(profile.setOutputMarkupId(true));
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1725878&r1=1725877&r2=1725878&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Thu Jan 21 06:55:32 2016
@@ -85,6 +85,7 @@ public class UploadableProfileImagePanel
//TODO display error
}
}
+ update();
target.add(profile, form);
}
});
