Author: dongxu
Date: Thu Sep 12 04:57:06 2013
New Revision: 1522420
URL: http://svn.apache.org/r1522420
Log:
quick fix something - use textbox for search and make contacts TODO
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/activity/SearchBoxActivity.java
Thu Sep 12 04:57:06 2013
@@ -103,6 +103,7 @@ public class SearchBoxActivity extends A
}));
+<<<<<<< HEAD
registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new
MessagesReceivedEventHandler() {
public void onMessagesReceived(MessagesReceivedEvent event) {
@@ -113,6 +114,17 @@ public class SearchBoxActivity extends A
}));
>>>>>>> fixed issue#74, finished to add search feature
+=======
+// registerHandler(eventBus.addHandler(MessagesReceivedEvent.TYPE, new
MessagesReceivedEventHandler() {
+//
+// public void onMessagesReceived(MessagesReceivedEvent event) {
+//
+// // fill the oracle
+// display.fillSearchOracle(event.getMessages());
+// }
+//
+// }));
+>>>>>>> quick fix something - use textbox for search and make contacts TODO
}
@Inject private Displayable display;
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/NavigationView.java
Thu Sep 12 04:57:06 2013
@@ -212,14 +212,15 @@ public class NavigationView extends Comp
@UiHandler("contact")
public void onContactClick(ClickEvent e){
- mailOuter.removeStyleName(style.selected());
- mail.removeStyleName(style.mailInnerSelected());
- contactOuter.addStyleName(style.selected());
- contact.addStyleName(style.contactInnerSelected());
-
- settingOuter.removeStyleName(style.selected());
- setting.removeStyleName(style.settingsInnerSelected());
- placeController.goTo(new ContactPlace("contacts"));
+ Window.alert("//TODO");
+// mailOuter.removeStyleName(style.selected());
+// mail.removeStyleName(style.mailInnerSelected());
+// contactOuter.addStyleName(style.selected());
+// contact.addStyleName(style.contactInnerSelected());
+//
+// settingOuter.removeStyleName(style.selected());
+// setting.removeStyleName(style.settingsInnerSelected());
+// placeController.goTo(new ContactPlace("contacts"));
}
Modified:
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java?rev=1522420&r1=1522419&r2=1522420&view=diff
==============================================================================
---
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
(original)
+++
james/hupa/trunk/client/src/main/java/org/apache/hupa/client/ui/SearchBoxView.java
Thu Sep 12 04:57:06 2013
@@ -43,14 +43,19 @@ import com.google.gwt.user.client.ui.Hor
import com.google.gwt.user.client.ui.MultiWordSuggestOracle;
import com.google.gwt.user.client.ui.SuggestBox;
<<<<<<< HEAD
+<<<<<<< HEAD
import com.google.gwt.user.client.ui.TextBox;
=======
>>>>>>> prepare to add search feature
+=======
+import com.google.gwt.user.client.ui.TextBox;
+>>>>>>> quick fix something - use textbox for search and make contacts TODO
public class SearchBoxView extends Composite implements
SearchBoxActivity.Displayable {
private MultiWordSuggestOracle oracle = new MultiWordSuggestOracle("
,@");
<<<<<<< HEAD
+<<<<<<< HEAD
private TextBox searchBox = new TextBox();
private Button searchButton = new Button("Search");
@UiField protected HorizontalPanel thisPanel;
@@ -74,18 +79,22 @@ public class SearchBoxView extends Compo
if (event.getNativeKeyCode() ==
KeyCodes.KEY_ENTER || (event.getNativeKeyCode() == KeyCodes.KEY_BACKSPACE &&
searchBox.getText().trim().equals(""))) {
=======
private SuggestBox searchBox = new SuggestBox(oracle);
+=======
+ private TextBox searchBox = new TextBox();
+>>>>>>> quick fix something - use textbox for search and make contacts TODO
private Button searchButton = new Button("Search");
@UiField protected HorizontalPanel thisPanel;
- @SuppressWarnings("deprecation")
+// @SuppressWarnings("deprecation")
public SearchBoxView() {
initWidget(binder.createAndBindUi(this));
// searchBox.addStyleName(HupaCSS.C_msg_search);
- searchBox.setAnimationEnabled(true);
- searchBox.setAutoSelectEnabled(false);
- searchBox.setLimit(20);
+// searchBox.setAnimationEnabled(true);
+// searchBox.setAutoSelectEnabled(false);
+// searchBox.setLimit(20);
+ searchBox.getElement().setAttribute("type", "search");
searchBox.addKeyUpHandler(new KeyUpHandler() {
public void onKeyUp(KeyUpEvent event) {
if (event.getNativeKeyCode() ==
KeyCodes.KEY_ENTER) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
