Skip to content

Commit

Permalink
version bump to 3.3.5, fix layout-animation interaction
Browse files Browse the repository at this point in the history
  • Loading branch information
Koen Deforche committed Dec 1, 2015
1 parent e95bb29 commit bfb9d53
Show file tree
Hide file tree
Showing 61 changed files with 167 additions and 167 deletions.
36 changes: 18 additions & 18 deletions src/eu/webtoolkit/jwt/DomElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ public void setEvent(String eventName, final String jsCode,
js.append("var e=event||window.event,");
js.append("o=this;");
if (anchorClick) {
js.append("if(e.ctrlKey||e.metaKey||(Wt3_3_4.button(e) > 1))return true;else{");
js.append("if(e.ctrlKey||e.metaKey||(Wt3_3_5.button(e) > 1))return true;else{");
}
js.append(jsCode);
if (isExposed) {
Expand Down Expand Up @@ -517,7 +517,7 @@ public void setTimeout(int msec, boolean jsRepeat) {
public void callMethod(final String method) {
++this.numManipulations_;
if (this.var_.length() == 0) {
this.javaScript_.append("Wt3_3_4").append(".$('").append(this.id_)
this.javaScript_.append("Wt3_3_5").append(".$('").append(this.id_)
.append("').");
} else {
this.javaScript_.append(this.var_).append('.');
Expand Down Expand Up @@ -579,7 +579,7 @@ public final void removeAllChildren() {
* Removes the element.
*/
public void removeFromParent() {
this.callJavaScript("Wt3_3_4.remove('" + this.getId() + "');", true);
this.callJavaScript("Wt3_3_5.remove('" + this.getId() + "');", true);
}

/**
Expand Down Expand Up @@ -693,7 +693,7 @@ public String asJavaScript(final EscapeOStream out,
if (this.removeAllChildren_ >= 0) {
this.declare(out);
if (this.removeAllChildren_ == 0) {
out.append("Wt3_3_4").append(".setHtml(")
out.append("Wt3_3_5").append(".setHtml(")
.append(this.var_).append(", '');\n");
} else {
out.append("$(").append(this.var_)
Expand Down Expand Up @@ -728,22 +728,22 @@ public String asJavaScript(final EscapeOStream out,
String style = this.properties_
.get(Property.PropertyStyleDisplay);
if (style.equals("none")) {
out.append("Wt3_3_4.hide('").append(this.id_)
out.append("Wt3_3_5.hide('").append(this.id_)
.append("');\n");
return this.var_;
} else {
if (style.length() == 0) {
out.append("Wt3_3_4.show('").append(this.id_)
out.append("Wt3_3_5.show('").append(this.id_)
.append("');\n");
return this.var_;
} else {
if (style.equals("inline")) {
out.append("Wt3_3_4.inline('" + this.id_
out.append("Wt3_3_5.inline('" + this.id_
+ "');\n");
return this.var_;
} else {
if (style.equals("block")) {
out.append("Wt3_3_4.block('" + this.id_
out.append("Wt3_3_5.block('" + this.id_
+ "');\n");
return this.var_;
}
Expand All @@ -758,7 +758,7 @@ public String asJavaScript(final EscapeOStream out,
}
}
if (this.unwrapped_) {
out.append("Wt3_3_4.unwrap('").append(this.id_).append("');\n");
out.append("Wt3_3_5.unwrap('").append(this.id_).append("');\n");
}
this.processEvents(app);
this.processProperties(app);
Expand All @@ -771,7 +771,7 @@ public String asJavaScript(final EscapeOStream out,
.append(");\n");
this.replaced_.createElement(out, app, insertJs.toString());
if (this.unstubbed_) {
out.append("Wt3_3_4.unstub(").append(this.var_).append(',')
out.append("Wt3_3_5.unstub(").append(this.var_).append(',')
.append(varr).append(',')
.append(this.hideWithDisplay_ ? 1 : 0)
.append(");\n");
Expand All @@ -792,7 +792,7 @@ public String asJavaScript(final EscapeOStream out,
}
if (!this.childrenToSave_.isEmpty()) {
this.declare(out);
out.append("Wt3_3_4").append(".saveReparented(")
out.append("Wt3_3_5").append(".saveReparented(")
.append(this.var_).append(");");
}
for (int i = 0; i < this.childrenToSave_.size(); ++i) {
Expand Down Expand Up @@ -1206,7 +1206,7 @@ public boolean isDefaultInline() {
public void declare(final EscapeOStream out) {
if (this.var_.length() == 0) {
out.append("var ").append(this.getCreateVar())
.append("=Wt3_3_4.$('").append(this.id_).append("');\n");
.append("=Wt3_3_5.$('").append(this.id_).append("');\n");
}
}

Expand Down Expand Up @@ -1485,7 +1485,7 @@ private void processEvents(WApplication app) {
DomElement.EventHandler keypress = this.eventHandlers_.get(S_keypress);
if (keypress != null && keypress.jsCode.length() != 0) {
MapUtils.access(self.eventHandlers_, S_keypress,
DomElement.EventHandler.class).jsCode = "if (Wt3_3_4.isKeyPress(event)){"
DomElement.EventHandler.class).jsCode = "if (Wt3_3_5.isKeyPress(event)){"
+ MapUtils.access(self.eventHandlers_, S_keypress,
DomElement.EventHandler.class).jsCode + '}';
}
Expand All @@ -1501,7 +1501,7 @@ private void processProperties(WApplication app) {
if (minw != null || maxw != null) {
if (w == null) {
StringBuilder expr = new StringBuilder();
expr.append("Wt3_3_4.IEwidth(this,");
expr.append("Wt3_3_5.IEwidth(this,");
if (minw != null) {
expr.append('\'').append(minw).append('\'');
self.properties_.remove(Property.PropertyStyleMinWidth);
Expand Down Expand Up @@ -1542,7 +1542,7 @@ private void setJavaScriptProperties(final EscapeOStream out,
if (this.willRenderInnerHtmlJS(app)) {
break;
}
out.append("Wt3_3_4.setHtml(").append(this.var_).append(',');
out.append("Wt3_3_5.setHtml(").append(this.var_).append(',');
if (!pushed) {
escaped.pushEscape(EscapeOStream.RuleSet.JsStringLiteralSQuote);
pushed = true;
Expand Down Expand Up @@ -1704,7 +1704,7 @@ private void setJavaScriptEvent(final EscapeOStream out, String eventName,
int fid = nextId_++;
out.append("function f").append(fid).append("(event) { ");
if (globalUnfocused) {
out.append("var g=event||window.event; var t=g.target||g.srcElement;if ((!t||Wt3_3_4.hasTag(t,'DIV') ||Wt3_3_4.hasTag(t,'BODY') ||Wt3_3_4.hasTag(t,'HTML'))) {");
out.append("var g=event||window.event; var t=g.target||g.srcElement;if ((!t||Wt3_3_5.hasTag(t,'DIV') ||Wt3_3_5.hasTag(t,'BODY') ||Wt3_3_5.hasTag(t,'HTML'))) {");
}
out.append(handler.jsCode);
if (globalUnfocused) {
Expand Down Expand Up @@ -1776,7 +1776,7 @@ private String addToParent(final EscapeOStream out, final String parentVar,
} else {
StringBuilder insertJS = new StringBuilder();
if (pos != -1) {
insertJS.append("Wt3_3_4.insertAt(").append(parentVar)
insertJS.append("Wt3_3_5.insertAt(").append(parentVar)
.append(",").append(this.var_).append(",").append(pos)
.append(");");
} else {
Expand Down Expand Up @@ -1808,7 +1808,7 @@ private void renderInnerHtmlJS(final EscapeOStream out, WApplication app) {
|| !this.childrenToAdd_.isEmpty()
|| !this.childrenHtml_.isEmpty() || innerHTML.length() != 0) {
this.declare(out);
out.append("Wt3_3_4.setHtml(").append(this.var_).append(",'");
out.append("Wt3_3_5.setHtml(").append(this.var_).append(",'");
out.pushEscape(EscapeOStream.RuleSet.JsStringLiteralSQuote);
List<DomElement.TimeoutEvent> timeouts = new ArrayList<DomElement.TimeoutEvent>();
EscapeOStream js = new EscapeOStream();
Expand Down
10 changes: 5 additions & 5 deletions src/eu/webtoolkit/jwt/PaintedSlider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ public void updateState() {
double max = l - this.slider_.getHandleWidth();
boolean horizontal = o == Orientation.Horizontal;
StringBuilder mouseDownJS = new StringBuilder();
mouseDownJS.append("obj.setAttribute('down', Wt3_3_4")
mouseDownJS.append("obj.setAttribute('down', Wt3_3_5")
.append(".widgetCoordinates(obj, event).").append(u)
.append(");").append("Wt3_3_4.cancelEvent(event);");
.append(");").append("Wt3_3_5.cancelEvent(event);");
StringBuilder computeD = new StringBuilder();
computeD.append("var objh = ").append(this.handle_.getJsRef())
.append(",").append("objf = ").append(this.fill_.getJsRef())
Expand All @@ -111,7 +111,7 @@ public void updateState() {
.append(" - pos;").append("var d = pos - down;");
StringBuilder mouseMovedJS = new StringBuilder();
mouseMovedJS.append("var down = obj.getAttribute('down');")
.append("var WT = Wt3_3_4;")
.append("var WT = Wt3_3_5;")
.append("if (down != null && down != '') {")
.append(computeD.toString())
.append("d = Math.max(0, Math.min(d, ").append(max)
Expand Down Expand Up @@ -143,7 +143,7 @@ public void updateState() {
mouseMovedJS.append("}").append("}");
StringBuilder mouseUpJS = new StringBuilder();
mouseUpJS.append("var down = obj.getAttribute('down');")
.append("var WT = Wt3_3_4;")
.append("var WT = Wt3_3_5;")
.append("if (down != null && down != '') {")
.append(computeD.toString()).append("d += ")
.append(this.slider_.getHandleWidth() / 2).append(";")
Expand All @@ -157,7 +157,7 @@ public void updateState() {
this.mouseUpJS_.setJavaScript("function(obj, event) {"
+ (enabled ? mouseUpJS.toString() : "") + "}");
this.handleClickedJS_.setJavaScript("function(obj, event) {"
+ "Wt3_3_4" + ".cancelEvent(event," + "Wt3_3_4"
+ "Wt3_3_5" + ".cancelEvent(event," + "Wt3_3_5"
+ ".CancelPropagate); }");
this.update();
this.updateSliderPosition();
Expand Down
Loading

0 comments on commit bfb9d53

Please sign in to comment.