Author: dongxu Date: Thu Sep 12 04:25:36 2013 New Revision: 1522345 URL: http://svn.apache.org/r1522345 Log: make the notification be able to cope with link
Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java?rev=1522345&r1=1522344&r2=1522345&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/HupaController.java Thu Sep 12 04:25:36 2013 @@ -97,6 +97,7 @@ import com.google.gwt.place.shared.Place <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.inject.Inject; @@ -129,6 +130,8 @@ public class HupaController { ======= import com.google.gwt.safehtml.shared.SafeHtml; >>>>>>> make a notification timer to be able to schedule the notice with >>>>>>> millis time. +======= +>>>>>>> make the notification be able to cope with link import com.google.gwt.user.client.Timer; >>>>>>> fixed issue#48, and add the original IdleTimer import com.google.gwt.user.client.ui.RootLayoutPanel; @@ -378,7 +381,7 @@ public class HupaController { }); } - public void showNotice(SafeHtml html, int millis){ + public void showNotice(String html, int millis){ noticeRegion.notice(html); if (millis > 0) hideNotice.schedule(millis); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java?rev=1522345&r1=1522344&r2=1522345&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/NotificationActivity.java Thu Sep 12 04:25:36 2013 @@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.IsW import org.apache.hupa.client.ui.WidgetDisplayable; import com.google.gwt.event.shared.EventBus; -import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.user.client.ui.AcceptsOneWidget; >>>>>>> add loading and notification bar(finishing the folder list click >>>>>>> event), related to the issue#18 import com.google.inject.Inject; @@ -48,7 +47,11 @@ public class NotificationActivity extend ======= public interface Displayable extends WidgetDisplayable { void hideNotification(); +<<<<<<< HEAD void notice(SafeHtml html); >>>>>>> add loading and notification bar(finishing the folder list click >>>>>>> event), related to the issue#18 +======= + void notice(String html); +>>>>>>> make the notification be able to cope with link } } Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java?rev=1522345&r1=1522344&r2=1522345&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/FoldersTreeViewModel.java Thu Sep 12 04:25:36 2013 @@ -71,7 +71,7 @@ public class FoldersTreeViewModel implem @Override public void onSelectionChange(SelectionChangeEvent event) { topBar.showLoading();//FIXME delay to show, why - controller.showNotice(SafeHtmlUtils.fromString("Hi, this is the notification test.<a href='http://g.cn/' target='_blacnk'>Link</a>"), 3000); + controller.showNotice("Hi, this is the notification test.<a href='http://g.cn/' target='_blacnk'>Link</a>", 10000); // notice.notice(SafeHtmlUtils.fromString("Hi, this is the notification test.<a href='http://g.cn/' target='_blacnk'>Link</a>")); SingleSelectionModel<ImapFolder> selectionModel = (SingleSelectionModel<ImapFolder>) event.getSource(); currentFolder = selectionModel.getSelectedObject(); Modified: james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java URL: http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java?rev=1522345&r1=1522344&r2=1522345&view=diff ============================================================================== --- james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java (original) +++ james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NotificationView.java Thu Sep 12 04:25:36 2013 @@ -24,9 +24,13 @@ import org.apache.hupa.client.activity.N import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.CssResource; <<<<<<< HEAD +<<<<<<< HEAD ======= import com.google.gwt.safehtml.shared.SafeHtml; >>>>>>> add loading and notification bar(finishing the folder list click >>>>>>> event), related to the issue#18 +======= +import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +>>>>>>> make the notification be able to cope with link import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; @@ -48,10 +52,14 @@ public class NotificationView extends Co @Override <<<<<<< HEAD +<<<<<<< HEAD public void notice(String html){ ======= public void notice(SafeHtml html){ >>>>>>> add loading and notification bar(finishing the folder list click >>>>>>> event), related to the issue#18 +======= + public void notice(String html){ +>>>>>>> make the notification be able to cope with link this.notificationContainer.removeStyleName(style.hideNotification()); this.notification.setHTML(html); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org