From a9b5e090e86e91a07555c568e70f7ed5a77d3d03 Mon Sep 17 00:00:00 2001 From: Roel Standaert Date: Fri, 4 Nov 2022 12:10:43 +0100 Subject: [PATCH] JWt 4.8.2 version bump and release notes --- build.xml | 2 +- examples/bobsmith/.classpath | 2 +- examples/charts/.classpath | 2 +- examples/composer/.classpath | 2 +- examples/dialog/.classpath | 2 +- examples/dragdrop/.classpath | 2 +- examples/feature/auth1/.classpath | 4 +-- examples/feature/itemmodel/.classpath | 2 +- examples/feature/mediaplayer/.classpath | 2 +- examples/feature/serverpush/.classpath | 2 +- examples/filetreetable/.classpath | 2 +- examples/form/.classpath | 2 +- examples/googlemap/.classpath | 2 +- examples/hello-mvn/pom.xml | 2 +- examples/hello/.classpath | 2 +- examples/hellowidgetset/.classpath | 2 +- examples/javascript/.classpath | 2 +- examples/mandelbrot/.classpath | 2 +- examples/mission/.classpath | 2 +- examples/painting/.classpath | 2 +- examples/planner/.classpath | 2 +- examples/simplechat/.classpath | 2 +- examples/style/.classpath | 2 +- examples/textedit/.classpath | 2 +- examples/treeview/.classpath | 2 +- examples/treeviewdragdrop/.classpath | 2 +- examples/widgetgallery/.classpath | 2 +- jwt-4.8.1.pom => jwt-4.8.2.pom | 2 +- jwt-auth-4.8.1.pom => jwt-auth-4.8.2.pom | 4 +-- overview.html | 11 +++++- src/eu/webtoolkit/jwt/DomElement.java | 36 +++++++++---------- src/eu/webtoolkit/jwt/FlexLayoutImpl.java | 4 +-- src/eu/webtoolkit/jwt/PaintedSlider.java | 6 ++-- src/eu/webtoolkit/jwt/ResizeSensor.java | 2 +- src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java | 4 +-- src/eu/webtoolkit/jwt/StdWidgetItemImpl.java | 8 ++--- src/eu/webtoolkit/jwt/WAbstractMedia.java | 10 +++--- src/eu/webtoolkit/jwt/WAbstractSpinBox.java | 2 +- src/eu/webtoolkit/jwt/WApplication.java | 8 ++--- src/eu/webtoolkit/jwt/WBootstrap2Theme.java | 2 +- src/eu/webtoolkit/jwt/WBootstrap3Theme.java | 2 +- src/eu/webtoolkit/jwt/WBootstrap5Theme.java | 2 +- src/eu/webtoolkit/jwt/WCanvasPaintDevice.java | 24 ++++++------- src/eu/webtoolkit/jwt/WClientGLWidget.java | 4 +-- src/eu/webtoolkit/jwt/WCssStyleSheet.java | 10 +++--- src/eu/webtoolkit/jwt/WCssTheme.java | 2 +- src/eu/webtoolkit/jwt/WDateEdit.java | 2 +- src/eu/webtoolkit/jwt/WDateValidator.java | 2 +- src/eu/webtoolkit/jwt/WDialog.java | 4 +-- src/eu/webtoolkit/jwt/WDoubleValidator.java | 2 +- src/eu/webtoolkit/jwt/WEnvironment.java | 4 +-- src/eu/webtoolkit/jwt/WFileDropWidget.java | 4 +-- src/eu/webtoolkit/jwt/WFileUpload.java | 8 ++--- src/eu/webtoolkit/jwt/WFlashObject.java | 2 +- src/eu/webtoolkit/jwt/WFormWidget.java | 6 ++-- src/eu/webtoolkit/jwt/WGLWidget.java | 8 ++--- src/eu/webtoolkit/jwt/WImage.java | 2 +- src/eu/webtoolkit/jwt/WIntValidator.java | 2 +- src/eu/webtoolkit/jwt/WInteractWidget.java | 24 ++++++------- src/eu/webtoolkit/jwt/WLeafletMap.java | 2 +- src/eu/webtoolkit/jwt/WLengthValidator.java | 2 +- src/eu/webtoolkit/jwt/WLineEdit.java | 4 +-- src/eu/webtoolkit/jwt/WMediaPlayer.java | 2 +- src/eu/webtoolkit/jwt/WMediaPlayerImpl.java | 2 +- src/eu/webtoolkit/jwt/WPainterPath.java | 2 +- src/eu/webtoolkit/jwt/WPanel.java | 2 +- src/eu/webtoolkit/jwt/WPopupMenu.java | 6 ++-- src/eu/webtoolkit/jwt/WPopupWidget.java | 2 +- src/eu/webtoolkit/jwt/WRectF.java | 2 +- src/eu/webtoolkit/jwt/WRegExpValidator.java | 2 +- src/eu/webtoolkit/jwt/WStackedWidget.java | 2 +- src/eu/webtoolkit/jwt/WSuggestionPopup.java | 4 +-- src/eu/webtoolkit/jwt/WTableView.java | 2 +- src/eu/webtoolkit/jwt/WTemplate.java | 2 +- src/eu/webtoolkit/jwt/WTextEdit.java | 4 +-- src/eu/webtoolkit/jwt/WTimeEdit.java | 2 +- src/eu/webtoolkit/jwt/WTimeValidator.java | 2 +- src/eu/webtoolkit/jwt/WTimerWidget.java | 2 +- src/eu/webtoolkit/jwt/WTransform.java | 14 ++++---- src/eu/webtoolkit/jwt/WTreeTable.java | 2 +- src/eu/webtoolkit/jwt/WTreeView.java | 4 +-- src/eu/webtoolkit/jwt/WVirtualImage.java | 4 +-- src/eu/webtoolkit/jwt/WWebWidget.java | 22 ++++++------ src/eu/webtoolkit/jwt/WWidget.java | 6 ++-- .../webtoolkit/jwt/WWidgetCanvasPainter.java | 4 +-- .../webtoolkit/jwt/WWidgetVectorPainter.java | 2 +- src/eu/webtoolkit/jwt/WebRenderer.java | 14 ++++---- src/eu/webtoolkit/jwt/WebSession.java | 4 +-- src/eu/webtoolkit/jwt/auth/AuthModel.java | 2 +- src/eu/webtoolkit/jwt/auth/OAuthProcess.java | 2 +- .../jwt/auth/RegistrationModel.java | 4 +-- .../jwt/chart/WAxisSliderWidget.java | 2 +- .../webtoolkit/jwt/chart/WCartesianChart.java | 6 ++-- 93 files changed, 209 insertions(+), 200 deletions(-) rename jwt-4.8.1.pom => jwt-4.8.2.pom (98%) rename jwt-auth-4.8.1.pom => jwt-auth-4.8.2.pom (96%) diff --git a/build.xml b/build.xml index 500c4867..d1bb6b82 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/examples/bobsmith/.classpath b/examples/bobsmith/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/bobsmith/.classpath +++ b/examples/bobsmith/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/charts/.classpath b/examples/charts/.classpath index f7b9563f..fa84d16a 100644 --- a/examples/charts/.classpath +++ b/examples/charts/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/composer/.classpath b/examples/composer/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/composer/.classpath +++ b/examples/composer/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/dialog/.classpath b/examples/dialog/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/dialog/.classpath +++ b/examples/dialog/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/dragdrop/.classpath b/examples/dragdrop/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/dragdrop/.classpath +++ b/examples/dragdrop/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/feature/auth1/.classpath b/examples/feature/auth1/.classpath index a72b780e..e016d097 100644 --- a/examples/feature/auth1/.classpath +++ b/examples/feature/auth1/.classpath @@ -27,8 +27,8 @@ - - + + diff --git a/examples/feature/itemmodel/.classpath b/examples/feature/itemmodel/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/feature/itemmodel/.classpath +++ b/examples/feature/itemmodel/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/feature/mediaplayer/.classpath b/examples/feature/mediaplayer/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/feature/mediaplayer/.classpath +++ b/examples/feature/mediaplayer/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/feature/serverpush/.classpath b/examples/feature/serverpush/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/feature/serverpush/.classpath +++ b/examples/feature/serverpush/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/filetreetable/.classpath b/examples/filetreetable/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/filetreetable/.classpath +++ b/examples/filetreetable/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/form/.classpath b/examples/form/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/form/.classpath +++ b/examples/form/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/googlemap/.classpath b/examples/googlemap/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/googlemap/.classpath +++ b/examples/googlemap/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/hello-mvn/pom.xml b/examples/hello-mvn/pom.xml index e4e9a6cd..633773c8 100644 --- a/examples/hello-mvn/pom.xml +++ b/examples/hello-mvn/pom.xml @@ -30,7 +30,7 @@ eu.webtoolkit jwt - 4.8.1 + 4.8.2 diff --git a/examples/hello/.classpath b/examples/hello/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/hello/.classpath +++ b/examples/hello/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/hellowidgetset/.classpath b/examples/hellowidgetset/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/hellowidgetset/.classpath +++ b/examples/hellowidgetset/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/javascript/.classpath b/examples/javascript/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/javascript/.classpath +++ b/examples/javascript/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/mandelbrot/.classpath b/examples/mandelbrot/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/mandelbrot/.classpath +++ b/examples/mandelbrot/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/mission/.classpath b/examples/mission/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/mission/.classpath +++ b/examples/mission/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/painting/.classpath b/examples/painting/.classpath index 740ffd2a..167b0a6e 100644 --- a/examples/painting/.classpath +++ b/examples/painting/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/planner/.classpath b/examples/planner/.classpath index 270901a8..177d3d57 100644 --- a/examples/planner/.classpath +++ b/examples/planner/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/simplechat/.classpath b/examples/simplechat/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/simplechat/.classpath +++ b/examples/simplechat/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/style/.classpath b/examples/style/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/style/.classpath +++ b/examples/style/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/textedit/.classpath b/examples/textedit/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/textedit/.classpath +++ b/examples/textedit/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/treeview/.classpath b/examples/treeview/.classpath index 793d5bb0..4259edf4 100644 --- a/examples/treeview/.classpath +++ b/examples/treeview/.classpath @@ -3,7 +3,7 @@ - + diff --git a/examples/treeviewdragdrop/.classpath b/examples/treeviewdragdrop/.classpath index 7e256b27..68367a87 100644 --- a/examples/treeviewdragdrop/.classpath +++ b/examples/treeviewdragdrop/.classpath @@ -4,7 +4,7 @@ - + diff --git a/examples/widgetgallery/.classpath b/examples/widgetgallery/.classpath index 22d595c9..428a6fdc 100644 --- a/examples/widgetgallery/.classpath +++ b/examples/widgetgallery/.classpath @@ -3,7 +3,7 @@ - + diff --git a/jwt-4.8.1.pom b/jwt-4.8.2.pom similarity index 98% rename from jwt-4.8.1.pom rename to jwt-4.8.2.pom index c46b628f..ee00a2a6 100644 --- a/jwt-4.8.1.pom +++ b/jwt-4.8.2.pom @@ -10,7 +10,7 @@ jwt jar Java Web Toolkit - 4.8.1 + 4.8.2 Java library for developing web applications https://webtoolkit.eu/jwt/ diff --git a/jwt-auth-4.8.1.pom b/jwt-auth-4.8.2.pom similarity index 96% rename from jwt-auth-4.8.1.pom rename to jwt-auth-4.8.2.pom index e5645d7a..ce8f3c93 100644 --- a/jwt-auth-4.8.1.pom +++ b/jwt-auth-4.8.2.pom @@ -10,7 +10,7 @@ jwt-auth jar Java Web Toolkit Authentication Library - 4.8.1 + 4.8.2 Authentication library for the Java Web Toolkit https://webtoolkit.eu/jwt/ @@ -31,7 +31,7 @@ eu.webtoolkit jwt - 4.8.1 + 4.8.2 diff --git a/overview.html b/overview.html index 94cfbeed..d0cb9c4f 100755 --- a/overview.html +++ b/overview.html @@ -11,7 +11,7 @@ dd p { margin-top: 0px; } dd div { margin: 10px 0px; } -JWt 4.8.1 +JWt 4.8.2 @@ -25,6 +25,15 @@

Release notes

the way you build JWt, the way you configure JWt or the JWt API and behaviour. It also indicates the main changes from version to verison. +

Release 4.8.2 (November 4, 2022)

+ +

+ JWt 4.8.2 is a simple patch release that fixes + issue #10976: + WAbstractItemView#setHeaderAlignment + would not properly update vertical alignment. +

+

Release 4.8.1 (September 22, 2022)

diff --git a/src/eu/webtoolkit/jwt/DomElement.java b/src/eu/webtoolkit/jwt/DomElement.java index bbe84564..c608afe9 100644 --- a/src/eu/webtoolkit/jwt/DomElement.java +++ b/src/eu/webtoolkit/jwt/DomElement.java @@ -326,7 +326,7 @@ public void setEvent( js.append("var e=event||window.event,"); js.append("o=this;"); if (anchorClick) { - js.append("if(e.ctrlKey||e.metaKey||(Wt4_8_1.button(e) > 1))return true;else{"); + js.append("if(e.ctrlKey||e.metaKey||(Wt4_8_2.button(e) > 1))return true;else{"); } js.append(jsCode); if (isExposed) { @@ -433,7 +433,7 @@ public void setTimeout(int delay, int interval) { public void callMethod(final String method) { ++this.numManipulations_; if (this.var_.length() == 0) { - this.javaScript_.append("Wt4_8_1").append(".$('").append(this.id_).append("')."); + this.javaScript_.append("Wt4_8_2").append(".$('").append(this.id_).append("')."); } else { this.javaScript_.append(this.var_).append('.'); } @@ -481,7 +481,7 @@ public final void removeAllChildren() { } /** Removes the element. */ public void removeFromParent() { - this.callJavaScript("Wt4_8_1.remove('" + this.getId() + "');", true); + this.callJavaScript("Wt4_8_2.remove('" + this.getId() + "');", true); } /** Replaces the element by another element. */ public void replaceWith(DomElement newElement) { @@ -570,7 +570,7 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority if (this.removeAllChildren_ >= 0) { this.declare(out); if (this.removeAllChildren_ == 0) { - out.append("Wt4_8_1").append(".setHtml(").append(this.var_).append(", '');\n"); + out.append("Wt4_8_2").append(".setHtml(").append(this.var_).append(", '');\n"); } else { out.append("$(") .append(this.var_) @@ -603,18 +603,18 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority if (this.properties_.get(Property.StyleDisplay) != null) { String style = this.properties_.get(Property.StyleDisplay); if (style.equals("none")) { - out.append("Wt4_8_1.hide('").append(this.id_).append("');\n"); + out.append("Wt4_8_2.hide('").append(this.id_).append("');\n"); return this.var_; } else { if (style.equals("inline")) { - out.append("Wt4_8_1.inline('" + this.id_ + "');\n"); + out.append("Wt4_8_2.inline('" + this.id_ + "');\n"); return this.var_; } else { if (style.equals("block")) { - out.append("Wt4_8_1.block('" + this.id_ + "');\n"); + out.append("Wt4_8_2.block('" + this.id_ + "');\n"); return this.var_; } else { - out.append("Wt4_8_1.show('") + out.append("Wt4_8_2.show('") .append(this.id_) .append("', '") .append(style) @@ -631,7 +631,7 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority } } if (this.unwrapped_) { - out.append("Wt4_8_1.unwrap('").append(this.id_).append("');\n"); + out.append("Wt4_8_2.unwrap('").append(this.id_).append("');\n"); } this.processEvents(app); this.processProperties(app); @@ -648,7 +648,7 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority .append(");\n"); this.replaced_.createElement(out, app, insertJs.toString()); if (this.unstubbed_) { - out.append("Wt4_8_1.unstub(") + out.append("Wt4_8_2.unstub(") .append(this.var_) .append(',') .append(varr) @@ -674,7 +674,7 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority } if (!this.childrenToSave_.isEmpty()) { this.declare(out); - out.append("Wt4_8_1").append(".saveReparented(").append(this.var_).append(");"); + out.append("Wt4_8_2").append(".saveReparented(").append(this.var_).append(");"); } for (int i = 0; i < this.childrenToSave_.size(); ++i) { out.append("var c") @@ -703,7 +703,7 @@ public String asJavaScript(final EscapeOStream out, DomElement.Priority priority } this.renderInnerHtmlJS(out, app); for (int i = 0; i < this.childrenToSave_.size(); ++i) { - out.append("Wt4_8_1.replaceWith('") + out.append("Wt4_8_2.replaceWith('") .append(this.childrenToSave_.get(i)) .append("',c") .append(this.var_) @@ -1087,7 +1087,7 @@ public void declare(final EscapeOStream out) { if (this.var_.length() == 0) { out.append("var ") .append(this.getCreateVar()) - .append("=Wt4_8_1.$('") + .append("=Wt4_8_2.$('") .append(this.id_) .append("');\n"); } @@ -1319,7 +1319,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 (Wt4_8_1.isKeyPress(event)){" + "if (Wt4_8_2.isKeyPress(event)){" + MapUtils.access(self.eventHandlers_, S_keypress, DomElement.EventHandler.class) .jsCode + '}'; @@ -1335,7 +1335,7 @@ private void processProperties(WApplication app) { if (minw != null || maxw != null) { if (w == null) { StringBuilder expr = new StringBuilder(); - expr.append("Wt4_8_1.IEwidth(this,"); + expr.append("Wt4_8_2.IEwidth(this,"); if (minw != null) { expr.append('\'').append(minw).append('\''); self.properties_.remove(Property.StyleMinWidth); @@ -1374,7 +1374,7 @@ private void setJavaScriptProperties(final EscapeOStream out, WApplication app) if (this.willRenderInnerHtmlJS(app)) { break; } - out.append("Wt4_8_1.setHtml(").append(this.var_).append(','); + out.append("Wt4_8_2.setHtml(").append(this.var_).append(','); if (!pushed) { escaped.pushEscape(EscapeOStream.RuleSet.JsStringLiteralSQuote); pushed = true; @@ -1613,7 +1613,7 @@ private String addToParent( StringBuilder insertJS = new StringBuilder(); if (pos != -1) { insertJS - .append("Wt4_8_1.insertAt(") + .append("Wt4_8_2.insertAt(") .append(parentVar) .append(",") .append(this.var_) @@ -1647,7 +1647,7 @@ private void renderInnerHtmlJS(final EscapeOStream out, WApplication app) { || !this.childrenHtml_.isEmpty() || innerHTML.length() != 0) { this.declare(out); - out.append("Wt4_8_1.setHtml(").append(this.var_).append(",'"); + out.append("Wt4_8_2.setHtml(").append(this.var_).append(",'"); out.pushEscape(EscapeOStream.RuleSet.JsStringLiteralSQuote); List timeouts = new ArrayList(); EscapeOStream js = new EscapeOStream(); diff --git a/src/eu/webtoolkit/jwt/FlexLayoutImpl.java b/src/eu/webtoolkit/jwt/FlexLayoutImpl.java index 12088ded..d0192037 100644 --- a/src/eu/webtoolkit/jwt/FlexLayoutImpl.java +++ b/src/eu/webtoolkit/jwt/FlexLayoutImpl.java @@ -84,7 +84,7 @@ public void updateDom(final DomElement parent) { } this.addedItems_.clear(); for (int i = 0; i < this.removedItems_.size(); ++i) { - div.callJavaScript("Wt4_8_1.remove('" + this.removedItems_.get(i) + "');", true); + div.callJavaScript("Wt4_8_2.remove('" + this.removedItems_.get(i) + "');", true); } this.removedItems_.clear(); StringBuilder js = new StringBuilder(); @@ -155,7 +155,7 @@ public DomElement createDomElement( result.addChild(el); } StringBuilder js = new StringBuilder(); - js.append("layout=new Wt4_8_1.FlexLayout(") + js.append("layout=new Wt4_8_2.FlexLayout(") .append(app.getJavaScriptClass()) .append(",'") .append(this.elId_) diff --git a/src/eu/webtoolkit/jwt/PaintedSlider.java b/src/eu/webtoolkit/jwt/PaintedSlider.java index d0708e4b..6ef13f51 100644 --- a/src/eu/webtoolkit/jwt/PaintedSlider.java +++ b/src/eu/webtoolkit/jwt/PaintedSlider.java @@ -134,7 +134,7 @@ public void updateState() { char[] buf = new char[30]; StringBuilder mouseDownJS = new StringBuilder(); mouseDownJS - .append("obj.setAttribute('down', Wt4_8_1") + .append("obj.setAttribute('down', Wt4_8_2") .append(".widgetCoordinates(obj, event).") .append(u) .append(");"); @@ -168,7 +168,7 @@ public void updateState() { StringBuilder mouseMovedJS = new StringBuilder(); mouseMovedJS .append("var down = obj.getAttribute('down');") - .append("var WT = Wt4_8_1;") + .append("var WT = Wt4_8_2;") .append("if (down != null && down != '') {") .append(computeD.toString()); mouseMovedJS @@ -212,7 +212,7 @@ public void updateState() { StringBuilder mouseUpJS = new StringBuilder(); mouseUpJS .append("var down = obj.getAttribute('down');") - .append("var WT = Wt4_8_1;") + .append("var WT = Wt4_8_2;") .append("if (down != null && down != '') {") .append(computeD.toString()) .append("d += ") diff --git a/src/eu/webtoolkit/jwt/ResizeSensor.java b/src/eu/webtoolkit/jwt/ResizeSensor.java index 4f7bcc88..8034d38b 100644 --- a/src/eu/webtoolkit/jwt/ResizeSensor.java +++ b/src/eu/webtoolkit/jwt/ResizeSensor.java @@ -27,7 +27,7 @@ public static void applyIfNeeded(WWidget w) { loadJavaScript(app); w.setJavaScriptMember(" ResizeSensor", ""); w.setJavaScriptMember( - " ResizeSensor", "new Wt4_8_1.ResizeSensor(Wt4_8_1," + w.getJsRef() + ")"); + " ResizeSensor", "new Wt4_8_2.ResizeSensor(Wt4_8_2," + w.getJsRef() + ")"); } } diff --git a/src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java b/src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java index 1fb96cc9..0e7d5745 100644 --- a/src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java +++ b/src/eu/webtoolkit/jwt/StdGridLayoutImpl2.java @@ -91,7 +91,7 @@ public void updateDom(final DomElement parent) { } this.addedItems_.clear(); for (int i = 0; i < this.removedItems_.size(); ++i) { - parent.callJavaScript("Wt4_8_1.remove('" + this.removedItems_.get(i) + "');", true); + parent.callJavaScript("Wt4_8_2.remove('" + this.removedItems_.get(i) + "');", true); } this.removedItems_.clear(); parent.addChild(div); @@ -187,7 +187,7 @@ public DomElement createDomElement( } StringBuilder js = new StringBuilder(); js.append(app.getJavaScriptClass()) - .append(".layouts2.add(new Wt4_8_1.StdLayout2(") + .append(".layouts2.add(new Wt4_8_2.StdLayout2(") .append(app.getJavaScriptClass()) .append(",'") .append(this.getId()) diff --git a/src/eu/webtoolkit/jwt/StdWidgetItemImpl.java b/src/eu/webtoolkit/jwt/StdWidgetItemImpl.java index 3e114583..7a5ea999 100644 --- a/src/eu/webtoolkit/jwt/StdWidgetItemImpl.java +++ b/src/eu/webtoolkit/jwt/StdWidgetItemImpl.java @@ -29,25 +29,25 @@ public StdWidgetItemImpl(WWidgetItem item) { public static String getChildrenResizeJS() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WtResize.js", wtjs10()); - return "Wt4_8_1.ChildrenResize"; + return "Wt4_8_2.ChildrenResize"; } public static String getChildrenGetPSJS() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WtResize.js", wtjs11()); - return "Wt4_8_1.ChildrenGetPS"; + return "Wt4_8_2.ChildrenGetPS"; } public static String getSecondResizeJS() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WtResize.js", wtjs12()); - return "Wt4_8_1.LastResize"; + return "Wt4_8_2.LastResize"; } public static String getSecondGetPSJS() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WtResize.js", wtjs13()); - return "Wt4_8_1.LastGetPS"; + return "Wt4_8_2.LastGetPS"; } public String getId() { diff --git a/src/eu/webtoolkit/jwt/WAbstractMedia.java b/src/eu/webtoolkit/jwt/WAbstractMedia.java index 82172a87..98ac6b69 100644 --- a/src/eu/webtoolkit/jwt/WAbstractMedia.java +++ b/src/eu/webtoolkit/jwt/WAbstractMedia.java @@ -264,7 +264,7 @@ public String getJsMediaRef() { if (this.mediaId_.length() == 0) { return "null"; } else { - return "Wt4_8_1.getElement('" + this.mediaId_ + "')"; + return "Wt4_8_2.getElement('" + this.mediaId_ + "')"; } } @@ -275,7 +275,7 @@ protected void getDomChanges(final List result, WApplication app) { if (this.sourcesChanged_) { for (int i = 0; i < this.sourcesRendered_; ++i) { media.callJavaScript( - "Wt4_8_1.remove('" + this.mediaId_ + "s" + String.valueOf(i) + "');", true); + "Wt4_8_2.remove('" + this.mediaId_ + "s" + String.valueOf(i) + "');", true); } this.sourcesRendered_ = 0; for (int i = 0; i < this.sources_.size(); ++i) { @@ -376,7 +376,7 @@ void updateMediaDom(final DomElement element, boolean all) { if (all && this.alternative_ != null) { element.setAttribute( "onerror", - "if(event.target.error && event.target.error.code==event.target.error.MEDIA_ERR_SRC_NOT_SUPPORTED){while (this.hasChildNodes())if (Wt4_8_1.hasTag(this.firstChild,'SOURCE')){this.removeChild(this.firstChild);}else{this.parentNode.insertBefore(this.firstChild, this);}this.style.display= 'none';}"); + "if(event.target.error && event.target.error.code==event.target.error.MEDIA_ERR_SRC_NOT_SUPPORTED){while (this.hasChildNodes())if (Wt4_8_2.hasTag(this.firstChild,'SOURCE')){this.removeChild(this.firstChild);}else{this.parentNode.insertBefore(this.firstChild, this);}this.style.display= 'none';}"); } if (all || this.flagsChanged_) { if (!all || this.flags_.contains(PlayerOption.Controls)) { @@ -502,7 +502,7 @@ private void renderSource( if (isLast && this.alternative_ != null) { element.setAttribute( "onerror", - "var media = this.parentNode;if(media){while (media && media.children.length)if (Wt4_8_1.hasTag(media.firstChild,'SOURCE')){media.removeChild(media.firstChild);}else{media.parentNode.insertBefore(media.firstChild, media);}media.style.display= 'none';}"); + "var media = this.parentNode;if(media){while (media && media.children.length)if (Wt4_8_2.hasTag(media.firstChild,'SOURCE')){media.removeChild(media.firstChild);}else{media.parentNode.insertBefore(media.firstChild, media);}media.style.display= 'none';}"); } else { element.setAttribute("onerror", ""); } @@ -535,7 +535,7 @@ private void loadJavaScript() { app.loadJavaScript("js/WAbstractMedia.js", wtjs1()); this.setJavaScriptMember( " WAbstractMedia", - "new Wt4_8_1.WAbstractMedia(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); + "new Wt4_8_2.WAbstractMedia(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); } } diff --git a/src/eu/webtoolkit/jwt/WAbstractSpinBox.java b/src/eu/webtoolkit/jwt/WAbstractSpinBox.java index 6e180e1b..5cbea8b6 100644 --- a/src/eu/webtoolkit/jwt/WAbstractSpinBox.java +++ b/src/eu/webtoolkit/jwt/WAbstractSpinBox.java @@ -273,7 +273,7 @@ private void defineJavaScript() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WSpinBox.js", wtjs1()); StringBuilder ss = new StringBuilder(); - ss.append("new Wt4_8_1.WSpinBox(") + ss.append("new Wt4_8_2.WSpinBox(") .append(app.getJavaScriptClass()) .append(",") .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WApplication.java b/src/eu/webtoolkit/jwt/WApplication.java index 8f93ad02..4f52166c 100644 --- a/src/eu/webtoolkit/jwt/WApplication.java +++ b/src/eu/webtoolkit/jwt/WApplication.java @@ -2136,9 +2136,9 @@ public void setLoadingIndicator(WLoadingIndicator indicator) { if (this.loadingIndicator_ != null) { this.domRoot_.addWidget(indicator); this.showLoadJS.setJavaScript( - "function(o,e) {Wt4_8_1.inline('" + this.loadingIndicator_.getId() + "');}"); + "function(o,e) {Wt4_8_2.inline('" + this.loadingIndicator_.getId() + "');}"); this.hideLoadJS.setJavaScript( - "function(o,e) {Wt4_8_1.hide('" + this.loadingIndicator_.getId() + "');}"); + "function(o,e) {Wt4_8_2.hide('" + this.loadingIndicator_.getId() + "');}"); this.loadingIndicator_.hide(); } } @@ -2544,7 +2544,7 @@ protected void enableAjax() { this.domRoot2_.enableAjax(); } this.doJavaScript( - "Wt4_8_1.ajaxInternalPaths(" + "Wt4_8_2.ajaxInternalPaths(" + WWebWidget.jsStringLiteral(this.resolveRelativeUrl(this.getBookmarkUrl("/"))) + ");"); } @@ -2910,7 +2910,7 @@ private void streamJavaScriptPreamble(final StringBuilder out, boolean all) { String scope = preamble.scope == JavaScriptScope.ApplicationScope ? this.getJavaScriptClass() - : "Wt4_8_1"; + : "Wt4_8_2"; if (preamble.type == JavaScriptObjectType.JavaScriptFunction) { out.append(scope) .append('.') diff --git a/src/eu/webtoolkit/jwt/WBootstrap2Theme.java b/src/eu/webtoolkit/jwt/WBootstrap2Theme.java index 94f2973c..89d17dba 100644 --- a/src/eu/webtoolkit/jwt/WBootstrap2Theme.java +++ b/src/eu/webtoolkit/jwt/WBootstrap2Theme.java @@ -433,7 +433,7 @@ public void applyValidationStyle( app.loadJavaScript("js/BootstrapValidate.js", wtjs2()); if (app.getEnvironment().hasAjax()) { StringBuilder js = new StringBuilder(); - js.append("Wt4_8_1.setValidationState(") + js.append("Wt4_8_2.setValidationState(") .append(widget.getJsRef()) .append(",") .append(validation.getState() == ValidationState.Valid ? 1 : 0) diff --git a/src/eu/webtoolkit/jwt/WBootstrap3Theme.java b/src/eu/webtoolkit/jwt/WBootstrap3Theme.java index c4a2e4c3..c6e77ac1 100644 --- a/src/eu/webtoolkit/jwt/WBootstrap3Theme.java +++ b/src/eu/webtoolkit/jwt/WBootstrap3Theme.java @@ -476,7 +476,7 @@ public void applyValidationStyle( app.loadJavaScript("js/BootstrapValidate.js", wtjs2()); if (app.getEnvironment().hasAjax()) { StringBuilder js = new StringBuilder(); - js.append("Wt4_8_1.setValidationState(") + js.append("Wt4_8_2.setValidationState(") .append(widget.getJsRef()) .append(",") .append(validation.getState() == ValidationState.Valid ? 1 : 0) diff --git a/src/eu/webtoolkit/jwt/WBootstrap5Theme.java b/src/eu/webtoolkit/jwt/WBootstrap5Theme.java index 969a7cef..89d6f812 100644 --- a/src/eu/webtoolkit/jwt/WBootstrap5Theme.java +++ b/src/eu/webtoolkit/jwt/WBootstrap5Theme.java @@ -501,7 +501,7 @@ public void applyValidationStyle( app.loadJavaScript("js/BootstrapValidate.js", wtjs2()); if (app.getEnvironment().hasAjax()) { StringBuilder js = new StringBuilder(); - js.append("Wt4_8_1.setValidationState(") + js.append("Wt4_8_2.setValidationState(") .append(widget.getJsRef()) .append(",") .append(validation.getState() == ValidationState.Valid ? 1 : 0) diff --git a/src/eu/webtoolkit/jwt/WCanvasPaintDevice.java b/src/eu/webtoolkit/jwt/WCanvasPaintDevice.java index f7952f37..07baf91d 100644 --- a/src/eu/webtoolkit/jwt/WCanvasPaintDevice.java +++ b/src/eu/webtoolkit/jwt/WCanvasPaintDevice.java @@ -194,7 +194,7 @@ public void drawImage( } int imageIndex = this.createImage(imgUri); this.js_ - .append("Wt4_8_1.gfxUtils.drawImage(ctx,images[") + .append("Wt4_8_2.gfxUtils.drawImage(ctx,images[") .append(String.valueOf(imageIndex)) .append("],") .append(WWebWidget.jsStringLiteral(imgUri)) @@ -216,7 +216,7 @@ public void drawPath(final WPainterPath path) { if (path.isJavaScriptBound()) { this.renderStateChanges(true); this.js_ - .append("Wt4_8_1.gfxUtils.drawPath(ctx,") + .append("Wt4_8_2.gfxUtils.drawPath(ctx,") .append(path.getJsRef()) .append(",") .append(this.currentNoBrush_ ? "false" : "true") @@ -234,7 +234,7 @@ public void drawStencilAlongPath( final WPainterPath stencil, final WPainterPath path, boolean softClipping) { this.renderStateChanges(true); this.js_ - .append("Wt4_8_1") + .append("Wt4_8_2") .append(".gfxUtils.drawStencilAlongPath(ctx,") .append(stencil.getJsRef()) .append(",") @@ -252,7 +252,7 @@ public void drawRect(final WRectF rectangle) { if (rectangle.isJavaScriptBound()) { this.renderStateChanges(true); this.js_ - .append("Wt4_8_1") + .append("Wt4_8_2") .append(".gfxUtils.drawRect(ctx,") .append(rectangle.getJsRef()) .append(",") @@ -285,7 +285,7 @@ public void drawText( case Html5Text: { this.js_ - .append("Wt4_8_1.gfxUtils.drawText(ctx,") + .append("Wt4_8_2.gfxUtils.drawText(ctx,") .append(rect.getJsRef()) .append(',') .append(String.valueOf(EnumUtils.valueOf(flags))) @@ -354,7 +354,7 @@ public void drawText( .append(");"); if (this.currentPen_.isJavaScriptBound()) { this.js_ - .append("ctx.fillStyle=Wt4_8_1.gfxUtils.css_text(") + .append("ctx.fillStyle=Wt4_8_2.gfxUtils.css_text(") .append(this.currentPen_.getJsRef()) .append(".color);"); } else { @@ -428,7 +428,7 @@ public void drawTextOnPath( double lineHeight, boolean softClipping) { this.renderStateChanges(true); - this.js_.append("Wt4_8_1.gfxUtils.drawTextOnPath(ctx,["); + this.js_.append("Wt4_8_2.gfxUtils.drawTextOnPath(ctx,["); for (int i = 0; i < text.size(); ++i) { if (i != 0) { this.js_.append(','); @@ -491,7 +491,7 @@ public void render( final String canvasId, DomElement text, final String updateAreasJs) { - String canvasVar = "Wt4_8_1.getElement('" + canvasId + "')"; + String canvasVar = "Wt4_8_2.getElement('" + canvasId + "')"; String paintedWidgetObjRef = paintedWidgetJsRef + ".wtObj"; StringBuilder tmp = new StringBuilder(); tmp.append(";(function(){"); @@ -669,7 +669,7 @@ private void renderStateChanges(boolean resetPathTranslation) { final WPainterPath p = this.getPainter().getClipPath(); if (!p.isEmpty()) { this.js_ - .append("Wt4_8_1") + .append("Wt4_8_2") .append(".gfxUtils.setClipPath(ctx,") .append(p.getJsRef()) .append(",") @@ -678,7 +678,7 @@ private void renderStateChanges(boolean resetPathTranslation) { .append(this.getPainter().hasClipping() ? "true" : "false") .append(");"); } else { - this.js_.append("Wt4_8_1").append(".gfxUtils.removeClipPath(ctx);"); + this.js_.append("Wt4_8_2").append(".gfxUtils.removeClipPath(ctx);"); } this.currentClipTransform_.assign(t); this.currentClipPath_.assign(p); @@ -755,7 +755,7 @@ && fequal(f.getM22(), this.currentTransform_.getM22())) { } else { if (this.getPainter().getPen().isJavaScriptBound()) { this.js_ - .append("ctx.strokeStyle=Wt4_8_1.gfxUtils.css_text(") + .append("ctx.strokeStyle=Wt4_8_2.gfxUtils.css_text(") .append(this.getPainter().getPen().getJsRef()) .append(".color);"); } else { @@ -846,7 +846,7 @@ && fequal(f.getM22(), this.currentTransform_.getM22())) { } else { if (this.currentBrush_.isJavaScriptBound()) { this.js_ - .append("ctx.fillStyle=Wt4_8_1.gfxUtils.css_text(") + .append("ctx.fillStyle=Wt4_8_2.gfxUtils.css_text(") .append(this.currentBrush_.getJsRef()) .append(".color);"); } else { diff --git a/src/eu/webtoolkit/jwt/WClientGLWidget.java b/src/eu/webtoolkit/jwt/WClientGLWidget.java index 22eaf168..c050f6bf 100644 --- a/src/eu/webtoolkit/jwt/WClientGLWidget.java +++ b/src/eu/webtoolkit/jwt/WClientGLWidget.java @@ -2399,7 +2399,7 @@ public void initJavaScriptMatrix4(final WGLWidget.JavaScriptMatrix4x4 mat) { public void setJavaScriptMatrix4( final WGLWidget.JavaScriptMatrix4x4 jsm, final javax.vecmath.Matrix4f m) { - this.js_.append("Wt4_8_1.glMatrix.mat4.set("); + this.js_.append("Wt4_8_2.glMatrix.mat4.set("); javax.vecmath.Matrix4f t = WebGLUtils.transpose(m); WebGLUtils.renderfv(this.js_, t, JsArrayType.Float32Array); this.js_.append(", ").append(jsm.getJsRef()).append(");"); @@ -2546,7 +2546,7 @@ public void restoreContext(final String jsRef) { public void render(final String jsRef, EnumSet flags) { if (flags.contains(RenderFlag.Full)) { StringWriter tmp = new StringWriter(); - tmp.append("{\nvar o = new Wt4_8_1.WGLWidget(") + tmp.append("{\nvar o = new Wt4_8_2.WGLWidget(") .append(WApplication.getInstance().getJavaScriptClass()) .append(",") .append(jsRef) diff --git a/src/eu/webtoolkit/jwt/WCssStyleSheet.java b/src/eu/webtoolkit/jwt/WCssStyleSheet.java index 5b16c05d..5a6accd3 100644 --- a/src/eu/webtoolkit/jwt/WCssStyleSheet.java +++ b/src/eu/webtoolkit/jwt/WCssStyleSheet.java @@ -177,14 +177,14 @@ public void cssText(final StringBuilder out, boolean all) { public void javaScriptUpdate(WApplication app, final StringBuilder js, boolean all) { if (!all) { for (int i = 0; i < this.rulesRemoved_.size(); ++i) { - js.append("Wt4_8_1.removeCssRule("); + js.append("Wt4_8_2.removeCssRule("); DomElement.jsStringLiteral(js, this.rulesRemoved_.get(i), '\''); js.append(");"); } this.rulesRemoved_.clear(); for (Iterator i_it = this.rulesModified_.iterator(); i_it.hasNext(); ) { WCssRule i = i_it.next(); - js.append("{ var d= Wt4_8_1.getCssRule("); + js.append("{ var d= Wt4_8_2.getCssRule("); DomElement.jsStringLiteral(js, i.getSelector(), '\''); js.append(");if(d){"); DomElement d = DomElement.updateGiven("d", DomElementType.SPAN); @@ -203,7 +203,7 @@ public void javaScriptUpdate(WApplication app, final StringBuilder js, boolean a final List toProcess = this.rules_; for (int i = 0; i < toProcess.size(); ++i) { WCssRule rule = toProcess.get(i); - js.append("Wt4_8_1.addCss('").append(rule.getSelector()).append("',"); + js.append("Wt4_8_2.addCss('").append(rule.getSelector()).append("',"); DomElement.jsStringLiteral(js, rule.getDeclarations(), '\''); js.append(");\n"); } @@ -211,7 +211,7 @@ public void javaScriptUpdate(WApplication app, final StringBuilder js, boolean a final List toProcess = this.rulesAdded_; for (int i = 0; i < toProcess.size(); ++i) { final WCssRule rule = toProcess.get(i); - js.append("Wt4_8_1.addCss('").append(rule.getSelector()).append("',"); + js.append("Wt4_8_2.addCss('").append(rule.getSelector()).append("',"); DomElement.jsStringLiteral(js, rule.getDeclarations(), '\''); js.append(");\n"); } @@ -224,7 +224,7 @@ public void javaScriptUpdate(WApplication app, final StringBuilder js, boolean a StringBuilder css = new StringBuilder(); this.cssText(css, all); if (!(css.length() == 0)) { - js.append("Wt4_8_1.addCssText("); + js.append("Wt4_8_2.addCssText("); DomElement.jsStringLiteral(js, css.toString(), '\''); js.append(");\n"); } diff --git a/src/eu/webtoolkit/jwt/WCssTheme.java b/src/eu/webtoolkit/jwt/WCssTheme.java index 0d42e18f..b93f990d 100644 --- a/src/eu/webtoolkit/jwt/WCssTheme.java +++ b/src/eu/webtoolkit/jwt/WCssTheme.java @@ -379,7 +379,7 @@ public void applyValidationStyle( app.loadJavaScript("js/CssThemeValidate.js", wtjs2()); if (app.getEnvironment().hasAjax()) { StringBuilder js = new StringBuilder(); - js.append("Wt4_8_1.setValidationState(") + js.append("Wt4_8_2.setValidationState(") .append(widget.getJsRef()) .append(",") .append(validation.getState() == ValidationState.Valid ? 1 : 0) diff --git a/src/eu/webtoolkit/jwt/WDateEdit.java b/src/eu/webtoolkit/jwt/WDateEdit.java index 8f4469b9..c3517978 100644 --- a/src/eu/webtoolkit/jwt/WDateEdit.java +++ b/src/eu/webtoolkit/jwt/WDateEdit.java @@ -344,7 +344,7 @@ private void defineJavaScript() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WDateEdit.js", wtjs1()); String jsObj = - "new Wt4_8_1.WDateEdit(" + "new Wt4_8_2.WDateEdit(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WDateValidator.java b/src/eu/webtoolkit/jwt/WDateValidator.java index 170e0fed..47093efe 100644 --- a/src/eu/webtoolkit/jwt/WDateValidator.java +++ b/src/eu/webtoolkit/jwt/WDateValidator.java @@ -304,7 +304,7 @@ public WString getInvalidTooLateText() { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WDateValidator(").append(this.isMandatory()).append(",["); + js.append("new Wt4_8_2.WDateValidator(").append(this.isMandatory()).append(",["); for (int i = 0; i < this.formats_.size(); ++i) { WDate.RegExpInfo r = WDate.formatToRegExp(this.formats_.get(i)); if (i != 0) { diff --git a/src/eu/webtoolkit/jwt/WDialog.java b/src/eu/webtoolkit/jwt/WDialog.java index 37229beb..9558e65c 100644 --- a/src/eu/webtoolkit/jwt/WDialog.java +++ b/src/eu/webtoolkit/jwt/WDialog.java @@ -394,7 +394,7 @@ public void setResizable(boolean resizable) { Resizable.loadJavaScript(WApplication.getInstance()); this.setJavaScriptMember( " Resizable", - "(new Wt4_8_1.Resizable(Wt4_8_1," + "(new Wt4_8_2.Resizable(Wt4_8_2," + this.getJsRef() + ")).onresize(function(w, h, done) {var obj = " + this.getJsRef() @@ -694,7 +694,7 @@ protected void render(EnumSet flags) { } } this.doJavaScript( - "new Wt4_8_1.WDialog(" + "new Wt4_8_2.WDialog(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WDoubleValidator.java b/src/eu/webtoolkit/jwt/WDoubleValidator.java index 6591dd56..9bf3e737 100644 --- a/src/eu/webtoolkit/jwt/WDoubleValidator.java +++ b/src/eu/webtoolkit/jwt/WDoubleValidator.java @@ -252,7 +252,7 @@ public boolean isIgnoreTrailingSpaces() { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WDoubleValidator(") + js.append("new Wt4_8_2.WDoubleValidator(") .append(this.isMandatory()) .append(',') .append(this.ignoreTrailingSpaces_) diff --git a/src/eu/webtoolkit/jwt/WEnvironment.java b/src/eu/webtoolkit/jwt/WEnvironment.java index 8fa65175..734bd3c8 100644 --- a/src/eu/webtoolkit/jwt/WEnvironment.java +++ b/src/eu/webtoolkit/jwt/WEnvironment.java @@ -50,7 +50,7 @@ public class WEnvironment { /** Wt's JavaScript scope. */ public static String getJavaScriptWtScope() { - return "Wt4_8_1"; + return "Wt4_8_2"; } /** * Parameters passed to the application. @@ -447,7 +447,7 @@ public String getDeploymentPath() { *

Example: "1.99.2" */ public static String getLibraryVersion() { - return "4.8.1"; + return "4.8.2"; } // public void libraryVersion(final bad java simple ref int series, final bad java simple ref int // major, final bad java simple ref int minor) ; diff --git a/src/eu/webtoolkit/jwt/WFileDropWidget.java b/src/eu/webtoolkit/jwt/WFileDropWidget.java index 81cd6816..9de8aa12 100644 --- a/src/eu/webtoolkit/jwt/WFileDropWidget.java +++ b/src/eu/webtoolkit/jwt/WFileDropWidget.java @@ -467,7 +467,7 @@ String renderRemoveJs(boolean recursive) { if (this.isRendered()) { String result = this.getJsRef() + ".destructor();"; if (!recursive) { - result += "Wt4_8_1.remove('" + this.getId() + "');"; + result += "Wt4_8_2.remove('" + this.getId() + "');"; } return result; } else { @@ -529,7 +529,7 @@ private void setup() { String maxFileSize = String.valueOf(WApplication.getInstance().getMaximumRequestSize()); this.setJavaScriptMember( " WFileDropWidget", - "new Wt4_8_1.WFileDropWidget(" + "new Wt4_8_2.WFileDropWidget(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WFileUpload.java b/src/eu/webtoolkit/jwt/WFileUpload.java index 6fa90d41..8b26553c 100644 --- a/src/eu/webtoolkit/jwt/WFileUpload.java +++ b/src/eu/webtoolkit/jwt/WFileUpload.java @@ -470,7 +470,7 @@ private void onData(long current, long total) { private void onDataExceeded(long dataExceeded) { this.doJavaScript( - "Wt4_8_1.$('if" + this.getId() + "').src='" + this.fileUploadTarget_.getUrl() + "';"); + "Wt4_8_2.$('if" + this.getId() + "').src='" + this.fileUploadTarget_.getUrl() + "';"); if (this.flags_.get(BIT_UPLOADING)) { this.flags_.clear(BIT_UPLOADING); this.handleFileTooLarge(dataExceeded); @@ -531,7 +531,7 @@ void updateDom(final DomElement element, boolean all) { element.setAttribute("action", this.fileUploadTarget_.generateUrl()); String maxFileSize = String.valueOf(WApplication.getInstance().getMaximumRequestSize()); String command = - "{var submit = true;var x = Wt4_8_1.$('in" + "{var submit = true;var x = Wt4_8_2.$('in" + this.getId() + "');if (x.files != null) {for (var i = 0; i < x.files.length; i++) {var f = x.files[i];if (f.size > " + maxFileSize @@ -678,9 +678,9 @@ protected void propagateSetEnabled(boolean enabled) { String renderRemoveJs(boolean recursive) { boolean isIE = WApplication.getInstance().getEnvironment().agentIsIE(); if (this.isRendered() && isIE) { - String result = "Wt4_8_1.$('if" + this.getId() + "').innerHTML = \"\";"; + String result = "Wt4_8_2.$('if" + this.getId() + "').innerHTML = \"\";"; if (!recursive) { - result += "Wt4_8_1.remove('" + this.getId() + "');"; + result += "Wt4_8_2.remove('" + this.getId() + "');"; } return result; } else { diff --git a/src/eu/webtoolkit/jwt/WFlashObject.java b/src/eu/webtoolkit/jwt/WFlashObject.java index 994f0854..aebac00c 100644 --- a/src/eu/webtoolkit/jwt/WFlashObject.java +++ b/src/eu/webtoolkit/jwt/WFlashObject.java @@ -144,7 +144,7 @@ public void setFlashVariable(final String name, final CharSequence value) { * for example on IE when flash is not installed. */ public String getJsFlashRef() { - return "Wt4_8_1.getElement('" + this.getId() + "_flash')"; + return "Wt4_8_2.getElement('" + this.getId() + "_flash')"; } /** * Sets content to be displayed if Flash is not available. diff --git a/src/eu/webtoolkit/jwt/WFormWidget.java b/src/eu/webtoolkit/jwt/WFormWidget.java index a54ec597..1cfee2f0 100644 --- a/src/eu/webtoolkit/jwt/WFormWidget.java +++ b/src/eu/webtoolkit/jwt/WFormWidget.java @@ -334,7 +334,7 @@ protected void validatorChanged() { this.setJavaScriptMember("wtValidate", validateJS); if (!(this.validateJs_ != null)) { this.validateJs_ = new JSlot(); - this.validateJs_.setJavaScript("function(o){Wt4_8_1.validate(o)}"); + this.validateJs_.setJavaScript("function(o){Wt4_8_2.validate(o)}"); this.keyWentUp().addListener(this.validateJs_); this.changed().addListener(this.validateJs_); if (this.getDomElementType() != DomElementType.SELECT) { @@ -352,7 +352,7 @@ protected void validatorChanged() { } StringUtils.replace(inputFilter, '/', "\\/"); this.filterInput_.setJavaScript( - "function(o,e){Wt4_8_1.filter(o,e," + jsStringLiteral(inputFilter) + ")}"); + "function(o,e){Wt4_8_2.filter(o,e," + jsStringLiteral(inputFilter) + ")}"); } else { if (this.filterInput_ != null) { this.keyPressed().removeListener(this.filterInput_); @@ -394,7 +394,7 @@ private void defineJavaScript(boolean force) { app.loadJavaScript("js/WFormWidget.js", wtjs1()); this.setJavaScriptMember( " WFormWidget", - "new Wt4_8_1.WFormWidget(" + "new Wt4_8_2.WFormWidget(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WGLWidget.java b/src/eu/webtoolkit/jwt/WGLWidget.java index e0332ae1..8047df5c 100644 --- a/src/eu/webtoolkit/jwt/WGLWidget.java +++ b/src/eu/webtoolkit/jwt/WGLWidget.java @@ -564,7 +564,7 @@ public WGLWidget.JavaScriptMatrix4x4 inverted() { } WGLWidget.JavaScriptMatrix4x4 copy = this.clone(); copy.jsRef_ = - "Wt4_8_1.glMatrix.mat4.inverse(" + this.jsRef_ + ", Wt4_8_1.glMatrix.mat4.create())"; + "Wt4_8_2.glMatrix.mat4.inverse(" + this.jsRef_ + ", Wt4_8_2.glMatrix.mat4.create())"; copy.operations_.add(WGLWidget.JavaScriptMatrix4x4.op.INVERT); return copy; } @@ -575,7 +575,7 @@ public WGLWidget.JavaScriptMatrix4x4 transposed() { } WGLWidget.JavaScriptMatrix4x4 copy = this.clone(); copy.jsRef_ = - "Wt4_8_1.glMatrix.mat4.transpose(" + this.jsRef_ + ", Wt4_8_1.glMatrix.mat4.create())"; + "Wt4_8_2.glMatrix.mat4.transpose(" + this.jsRef_ + ", Wt4_8_2.glMatrix.mat4.create())"; copy.operations_.add(WGLWidget.JavaScriptMatrix4x4.op.TRANSPOSE); return copy; } @@ -586,10 +586,10 @@ public WGLWidget.JavaScriptMatrix4x4 multiply(final javax.vecmath.Matrix4f m) { } WGLWidget.JavaScriptMatrix4x4 copy = this.clone(); StringWriter ss = new StringWriter(); - ss.append("Wt4_8_1.glMatrix.mat4.multiply(").append(this.jsRef_).append(","); + ss.append("Wt4_8_2.glMatrix.mat4.multiply(").append(this.jsRef_).append(","); javax.vecmath.Matrix4f t = WebGLUtils.transpose(m); WebGLUtils.renderfv(ss, t, this.context_.pImpl_.getArrayType()); - ss.append(", Wt4_8_1.glMatrix.mat4.create())"); + ss.append(", Wt4_8_2.glMatrix.mat4.create())"); copy.jsRef_ = ss.toString(); copy.operations_.add(WGLWidget.JavaScriptMatrix4x4.op.MULTIPLY); copy.matrices_.add(m); diff --git a/src/eu/webtoolkit/jwt/WImage.java b/src/eu/webtoolkit/jwt/WImage.java index 7ead92ba..065fe7e0 100644 --- a/src/eu/webtoolkit/jwt/WImage.java +++ b/src/eu/webtoolkit/jwt/WImage.java @@ -381,7 +381,7 @@ protected void defineJavaScript() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WImage.js", wtjs1()); StringBuilder ss = new StringBuilder(); - ss.append("new Wt4_8_1.WImage(") + ss.append("new Wt4_8_2.WImage(") .append(app.getJavaScriptClass()) .append(",") .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WIntValidator.java b/src/eu/webtoolkit/jwt/WIntValidator.java index c35dc80c..580da815 100644 --- a/src/eu/webtoolkit/jwt/WIntValidator.java +++ b/src/eu/webtoolkit/jwt/WIntValidator.java @@ -250,7 +250,7 @@ public boolean isIgnoreTrailingSpaces() { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WIntValidator(").append(this.isMandatory()).append(','); + js.append("new Wt4_8_2.WIntValidator(").append(this.isMandatory()).append(','); if (this.bottom_ != Integer.MIN_VALUE) { js.append(this.bottom_); } else { diff --git a/src/eu/webtoolkit/jwt/WInteractWidget.java b/src/eu/webtoolkit/jwt/WInteractWidget.java index 610b8cbc..e2af3f05 100644 --- a/src/eu/webtoolkit/jwt/WInteractWidget.java +++ b/src/eu/webtoolkit/jwt/WInteractWidget.java @@ -533,7 +533,7 @@ public void setPopup(boolean popup) { if (popup && WApplication.getInstance().getEnvironment().hasAjax()) { this.clicked() .addListener( - "function(o,e) { if (Wt4_8_1.WPopupWidget && o.wtPopup) {Wt4_8_1.WPopupWidget.popupClicked = o;$(document).trigger('click', e);Wt4_8_1.WPopupWidget.popupClicked = null; }}"); + "function(o,e) { if (Wt4_8_2.WPopupWidget && o.wtPopup) {Wt4_8_2.WPopupWidget.popupClicked = o;$(document).trigger('click', e);Wt4_8_2.WPopupWidget.popupClicked = null; }}"); this.clicked().preventPropagation(); } super.setPopup(popup); @@ -625,7 +625,7 @@ void updateDom(final DomElement element, boolean all) { String CheckDisabled = "if($(o).hasClass('" + app.getTheme().getDisabledClass() - + "')){Wt4_8_1.cancelEvent(e);return;}"; + + "')){Wt4_8_2.cancelEvent(e);return;}"; if (updateMouseDown) { StringBuilder js = new StringBuilder(); js.append(CheckDisabled); @@ -637,11 +637,11 @@ void updateDom(final DomElement element, boolean all) { && mouseDown.isConnected() && (mouseUp != null && mouseUp.isConnected() || mouseMove != null && mouseMove.isConnected())) { - js.append("Wt4_8_1.capture(this);"); + js.append("Wt4_8_2.capture(this);"); } if (mouseMove != null && mouseMove.isConnected() || mouseDrag != null && mouseDrag.isConnected()) { - js.append("Wt4_8_1.mouseDown(e);"); + js.append("Wt4_8_2.mouseDown(e);"); } if (mouseDown != null) { js.append(mouseDown.getJavaScript()); @@ -657,7 +657,7 @@ void updateDom(final DomElement element, boolean all) { js.append(CheckDisabled); if (mouseMove != null && mouseMove.isConnected() || mouseDrag != null && mouseDrag.isConnected()) { - js.append("Wt4_8_1.mouseUp(e);"); + js.append("Wt4_8_2.mouseUp(e);"); } if (mouseUp != null) { js.append(mouseUp.getJavaScript()); @@ -678,8 +678,8 @@ void updateDom(final DomElement element, boolean all) { if (mouseDrag != null) { actions.add( new DomElement.EventAction( - "Wt4_8_1.buttons", - mouseDrag.getJavaScript() + "Wt4_8_1.drag(e);", + "Wt4_8_2.buttons", + mouseDrag.getJavaScript() + "Wt4_8_2.drag(e);", mouseDrag.encodeCmd(), mouseDrag.isExposedSignal())); mouseDrag.updateOk(); @@ -702,7 +702,7 @@ void updateDom(final DomElement element, boolean all) { && touchStart.isConnected() && (touchEnd != null && touchEnd.isConnected() || touchMove != null && touchMove.isConnected())) { - js.append("Wt4_8_1.capture(this);"); + js.append("Wt4_8_2.capture(this);"); } if (touchStart != null) { js.append(touchStart.getJavaScript()); @@ -744,12 +744,12 @@ void updateDom(final DomElement element, boolean all) { StringBuilder js = new StringBuilder(); js.append(CheckDisabled); if (mouseDrag != null) { - js.append("if (Wt4_8_1.dragged()) return;"); + js.append("if (Wt4_8_2.dragged()) return;"); } if (mouseDblClick != null && mouseDblClick.needsUpdate(all)) { if (mouseClick != null) { if (mouseClick.isDefaultActionPrevented() || mouseClick.isPropagationPrevented()) { - js.append("Wt4_8_1.cancelEvent(e"); + js.append("Wt4_8_2.cancelEvent(e"); if (mouseClick.isDefaultActionPrevented() && mouseClick.isPropagationPrevented()) { js.append(");"); } else { @@ -761,7 +761,7 @@ void updateDom(final DomElement element, boolean all) { } } } - js.append("if(Wt4_8_1.isDblClick(o, e)) {").append(mouseDblClick.getJavaScript()); + js.append("if(Wt4_8_2.isDblClick(o, e)) {").append(mouseDblClick.getJavaScript()); if (mouseDblClick.isExposedSignal()) { js.append(app.getJavaScriptClass()) .append("._p_.update(o,'") @@ -770,7 +770,7 @@ void updateDom(final DomElement element, boolean all) { } mouseDblClick.updateOk(); js.append( - "}else{if (Wt4_8_1.isIElt9 && document.createEventObject) e = document.createEventObject(e);o.wtE1 = e;o.wtClickTimeout = setTimeout(function() {o.wtClickTimeout = null; o.wtE1 = null;"); + "}else{if (Wt4_8_2.isIElt9 && document.createEventObject) e = document.createEventObject(e);o.wtE1 = e;o.wtClickTimeout = setTimeout(function() {o.wtClickTimeout = null; o.wtE1 = null;"); if (mouseClick != null) { js.append(mouseClick.getJavaScript()); if (mouseClick.isExposedSignal()) { diff --git a/src/eu/webtoolkit/jwt/WLeafletMap.java b/src/eu/webtoolkit/jwt/WLeafletMap.java index 4599521a..138b351e 100644 --- a/src/eu/webtoolkit/jwt/WLeafletMap.java +++ b/src/eu/webtoolkit/jwt/WLeafletMap.java @@ -665,7 +665,7 @@ private void defineJavaScript() { String optionsStr = this.options_.toString(); StringBuilder ss = new StringBuilder(); EscapeOStream es = new EscapeOStream(ss); - es.append("new Wt4_8_1.WLeafletMap(") + es.append("new Wt4_8_2.WLeafletMap(") .append(app.getJavaScriptClass()) .append(",") .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WLengthValidator.java b/src/eu/webtoolkit/jwt/WLengthValidator.java index 73b702eb..ed363016 100644 --- a/src/eu/webtoolkit/jwt/WLengthValidator.java +++ b/src/eu/webtoolkit/jwt/WLengthValidator.java @@ -200,7 +200,7 @@ public WString getInvalidTooLongText() { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WLengthValidator(").append(this.isMandatory()).append(','); + js.append("new Wt4_8_2.WLengthValidator(").append(this.isMandatory()).append(','); if (this.minLength_ != 0) { js.append(this.minLength_); } else { diff --git a/src/eu/webtoolkit/jwt/WLineEdit.java b/src/eu/webtoolkit/jwt/WLineEdit.java index 0918d823..e5887d98 100644 --- a/src/eu/webtoolkit/jwt/WLineEdit.java +++ b/src/eu/webtoolkit/jwt/WLineEdit.java @@ -336,7 +336,7 @@ public void setSelection(int start, int length) { String s = String.valueOf(start); String e = String.valueOf(start + length); this.doJavaScript( - "Wt4_8_1.setUnicodeSelectionRange(" + this.getJsRef() + "," + s + "," + e + ")"); + "Wt4_8_2.setUnicodeSelectionRange(" + this.getJsRef() + "," + s + "," + e + ")"); } /** * Returns the current cursor position. @@ -697,7 +697,7 @@ private void defineJavaScript() { String space = ""; space += this.spaceChar_; String jsObj = - "new Wt4_8_1.WLineEdit(" + "new Wt4_8_2.WLineEdit(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WMediaPlayer.java b/src/eu/webtoolkit/jwt/WMediaPlayer.java index f441eddd..04de312c 100644 --- a/src/eu/webtoolkit/jwt/WMediaPlayer.java +++ b/src/eu/webtoolkit/jwt/WMediaPlayer.java @@ -767,7 +767,7 @@ protected void render(EnumSet flags) { first = false; } ss.append('}').append("});"); - ss.append("new Wt4_8_1.WMediaPlayer(") + ss.append("new Wt4_8_2.WMediaPlayer(") .append(app.getJavaScriptClass()) .append(',') .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WMediaPlayerImpl.java b/src/eu/webtoolkit/jwt/WMediaPlayerImpl.java index 49cbb71f..076f27cb 100644 --- a/src/eu/webtoolkit/jwt/WMediaPlayerImpl.java +++ b/src/eu/webtoolkit/jwt/WMediaPlayerImpl.java @@ -31,7 +31,7 @@ String renderRemoveJs(boolean recursive) { if (this.isRendered()) { String result = this.player_.getJsPlayerRef() + ".jPlayer('destroy');"; if (!recursive) { - result += "Wt4_8_1.remove('" + this.getId() + "');"; + result += "Wt4_8_2.remove('" + this.getId() + "');"; } return result; } else { diff --git a/src/eu/webtoolkit/jwt/WPainterPath.java b/src/eu/webtoolkit/jwt/WPainterPath.java index 01dc3cd9..0a134af4 100644 --- a/src/eu/webtoolkit/jwt/WPainterPath.java +++ b/src/eu/webtoolkit/jwt/WPainterPath.java @@ -729,7 +729,7 @@ public final WRectF getControlPointRect() { public WPainterPath getCrisp() { WPainterPath result = new WPainterPath(); if (this.isJavaScriptBound()) { - result.assignBinding(this, "Wt4_8_1.gfxUtils.path_crisp(" + this.getJsRef() + ')'); + result.assignBinding(this, "Wt4_8_2.gfxUtils.path_crisp(" + this.getJsRef() + ')'); } for (int i = 0; i < this.segments_.size(); ++i) { final WPainterPath.Segment segment = this.segments_.get(i); diff --git a/src/eu/webtoolkit/jwt/WPanel.java b/src/eu/webtoolkit/jwt/WPanel.java index 8a888354..e76c827e 100644 --- a/src/eu/webtoolkit/jwt/WPanel.java +++ b/src/eu/webtoolkit/jwt/WPanel.java @@ -56,7 +56,7 @@ public WPanel(WContainerWidget parentContainer) { this.impl_.bindWidget("contents", centralArea); this.setJavaScriptMember( WT_RESIZE_JS, - "function(self, w, h, s) {var hdefined = h >= 0;if (hdefined) {var mh = Wt4_8_1.px(self, 'maxHeight');if (mh > 0) h = Math.min(h, mh);}if (Wt4_8_1.boxSizing(self)) {h -= Wt4_8_1.px(self, 'borderTopWidth') + Wt4_8_1.px(self, 'borderBottomWidth');}var c = self.lastChild;var t = c.previousSibling;if (t)h -= t.offsetHeight;h -= 8;if (hdefined && h > 0) {c.lh = true;c.style.height = h + 'px';$(c).children().each(function() { var self = $(this), padding = self.outerHeight() - self.height();self.height(h - padding);this.lh = true;});} else {c.style.height = '';c.lh = false;$(c).children().each(function() { this.style.height = '';this.lh = false;});}};"); + "function(self, w, h, s) {var hdefined = h >= 0;if (hdefined) {var mh = Wt4_8_2.px(self, 'maxHeight');if (mh > 0) h = Math.min(h, mh);}if (Wt4_8_2.boxSizing(self)) {h -= Wt4_8_2.px(self, 'borderTopWidth') + Wt4_8_2.px(self, 'borderBottomWidth');}var c = self.lastChild;var t = c.previousSibling;if (t)h -= t.offsetHeight;h -= 8;if (hdefined && h > 0) {c.lh = true;c.style.height = h + 'px';$(c).children().each(function() { var self = $(this), padding = self.outerHeight() - self.height();self.height(h - padding);this.lh = true;});} else {c.style.height = '';c.lh = false;$(c).children().each(function() { this.style.height = '';this.lh = false;});}};"); this.setJavaScriptMember(WT_GETPS_JS, StdWidgetItemImpl.getSecondGetPSJS()); if (parentContainer != null) parentContainer.addWidget(this); } diff --git a/src/eu/webtoolkit/jwt/WPopupMenu.java b/src/eu/webtoolkit/jwt/WPopupMenu.java index 699c3788..0d46fcb0 100644 --- a/src/eu/webtoolkit/jwt/WPopupMenu.java +++ b/src/eu/webtoolkit/jwt/WPopupMenu.java @@ -167,7 +167,7 @@ public void popup(final WPoint p) { this.setOffsets(new WLength(42), EnumSet.of(Side.Left, Side.Top)); this.setOffsets(new WLength(-10000), EnumSet.of(Side.Left, Side.Top)); this.doJavaScript( - "Wt4_8_1.positionXY('" + "Wt4_8_2.positionXY('" + this.getId() + "'," + String.valueOf(p.getX()) @@ -417,7 +417,7 @@ protected void render(EnumSet flags) { String renderRemoveJs(boolean recursive) { String result = super.renderRemoveJs(true); - result += "Wt4_8_1.remove('" + this.getId() + "');"; + result += "Wt4_8_2.remove('" + this.getId() + "');"; return result; } @@ -496,7 +496,7 @@ private void prepareRender(WApplication app) { if (!this.cancel_.isConnected()) { app.loadJavaScript("js/WPopupMenu.js", wtjs1()); StringBuilder s = new StringBuilder(); - s.append("new Wt4_8_1.WPopupMenu(") + s.append("new Wt4_8_2.WPopupMenu(") .append(app.getJavaScriptClass()) .append(',') .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WPopupWidget.java b/src/eu/webtoolkit/jwt/WPopupWidget.java index 3a79dca6..cabff7b1 100644 --- a/src/eu/webtoolkit/jwt/WPopupWidget.java +++ b/src/eu/webtoolkit/jwt/WPopupWidget.java @@ -226,7 +226,7 @@ private void defineJS() { app.loadJavaScript("js/WPopupWidget.js", wtjs1()); StringBuilder jsObj = new StringBuilder(); jsObj - .append("new Wt4_8_1.WPopupWidget(") + .append("new Wt4_8_2.WPopupWidget(") .append(app.getJavaScriptClass()) .append(',') .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WRectF.java b/src/eu/webtoolkit/jwt/WRectF.java index 789278d5..5ca4a0ca 100644 --- a/src/eu/webtoolkit/jwt/WRectF.java +++ b/src/eu/webtoolkit/jwt/WRectF.java @@ -420,7 +420,7 @@ public WRectF getNormalized() { } WRectF result = new WRectF(x, y, w, h); if (this.isJavaScriptBound()) { - result.assignBinding(this, "Wt4_8_1.gfxUtils.rect_normalized(" + this.getJsRef() + ')'); + result.assignBinding(this, "Wt4_8_2.gfxUtils.rect_normalized(" + this.getJsRef() + ')'); } return result; } diff --git a/src/eu/webtoolkit/jwt/WRegExpValidator.java b/src/eu/webtoolkit/jwt/WRegExpValidator.java index a8682c0e..a68e1ac2 100644 --- a/src/eu/webtoolkit/jwt/WRegExpValidator.java +++ b/src/eu/webtoolkit/jwt/WRegExpValidator.java @@ -159,7 +159,7 @@ public WString getInvalidNoMatchText() { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WRegExpValidator(").append(this.isMandatory()).append(','); + js.append("new Wt4_8_2.WRegExpValidator(").append(this.isMandatory()).append(','); js.append(WWebWidget.jsStringLiteral(this.pattern_)).append(",'"); if ((this.regex_.flags() & Pattern.CASE_INSENSITIVE) != 0) { js.append('i'); diff --git a/src/eu/webtoolkit/jwt/WStackedWidget.java b/src/eu/webtoolkit/jwt/WStackedWidget.java index 3aa48337..166b758d 100644 --- a/src/eu/webtoolkit/jwt/WStackedWidget.java +++ b/src/eu/webtoolkit/jwt/WStackedWidget.java @@ -295,7 +295,7 @@ private void defineJavaScript() { app.loadJavaScript("js/WStackedWidget.js", wtjs1()); this.setJavaScriptMember( " WStackedWidget", - "new Wt4_8_1.WStackedWidget(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); + "new Wt4_8_2.WStackedWidget(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); this.setJavaScriptMember(WT_RESIZE_JS, this.getJsRef() + ".wtObj.wtResize"); this.setJavaScriptMember(WT_GETPS_JS, this.getJsRef() + ".wtObj.wtGetPs"); if (this.loadAnimateJS_) { diff --git a/src/eu/webtoolkit/jwt/WSuggestionPopup.java b/src/eu/webtoolkit/jwt/WSuggestionPopup.java index a21e7b43..4f1e9a6c 100644 --- a/src/eu/webtoolkit/jwt/WSuggestionPopup.java +++ b/src/eu/webtoolkit/jwt/WSuggestionPopup.java @@ -865,7 +865,7 @@ private void defineJavaScript() { String autoSelect = this.isAutoSelectEnabled_ ? "true" : "false"; this.setJavaScriptMember( " WSuggestionPopup", - "new Wt4_8_1.WSuggestionPopup(" + "new Wt4_8_2.WSuggestionPopup(" + app.getJavaScriptClass() + "," + this.getJsRef() @@ -914,7 +914,7 @@ static WJavaScriptPreamble wtjs2() { static String instantiateStdMatcher(final WSuggestionPopup.Options options) { StringBuilder s = new StringBuilder(); - s.append("new Wt4_8_1.WSuggestionPopupStdMatcher(") + s.append("new Wt4_8_2.WSuggestionPopupStdMatcher(") .append(WWebWidget.jsStringLiteral(options.highlightBeginTag)) .append(", ") .append(WWebWidget.jsStringLiteral(options.highlightEndTag)) diff --git a/src/eu/webtoolkit/jwt/WTableView.java b/src/eu/webtoolkit/jwt/WTableView.java index d9f6df4d..eba158be 100644 --- a/src/eu/webtoolkit/jwt/WTableView.java +++ b/src/eu/webtoolkit/jwt/WTableView.java @@ -2169,7 +2169,7 @@ private void defineJavaScript() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WTableView.js", wtjs1()); StringBuilder s = new StringBuilder(); - s.append("new Wt4_8_1.WTableView(") + s.append("new Wt4_8_2.WTableView(") .append(app.getJavaScriptClass()) .append(',') .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WTemplate.java b/src/eu/webtoolkit/jwt/WTemplate.java index 25b28f1f..4f460dfb 100644 --- a/src/eu/webtoolkit/jwt/WTemplate.java +++ b/src/eu/webtoolkit/jwt/WTemplate.java @@ -1440,7 +1440,7 @@ private static int parseArgs(final String text, int pos, final List res private void unrenderWidget(WWidget w, final DomElement el) { String removeJs = w.renderRemoveJs(false); if (removeJs.charAt(0) == '_') { - el.callJavaScript("Wt4_8_1.remove('" + removeJs.substring(1) + "');", true); + el.callJavaScript("Wt4_8_2.remove('" + removeJs.substring(1) + "');", true); } else { el.callJavaScript(removeJs, true); } diff --git a/src/eu/webtoolkit/jwt/WTextEdit.java b/src/eu/webtoolkit/jwt/WTextEdit.java index d89c8d55..9a55d747 100644 --- a/src/eu/webtoolkit/jwt/WTextEdit.java +++ b/src/eu/webtoolkit/jwt/WTextEdit.java @@ -294,7 +294,7 @@ String renderRemoveJs(boolean recursive) { if (this.isRendered()) { String result = this.getJsRef() + ".ed.remove();"; if (!recursive) { - result += "Wt4_8_1.remove('" + this.getId() + "');"; + result += "Wt4_8_2.remove('" + this.getId() + "');"; } return result; } else { @@ -395,7 +395,7 @@ private void init() { this.version_ = getTinyMCEVersion(); this.setJavaScriptMember( " WTextEdit", - "new Wt4_8_1.WTextEdit(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); + "new Wt4_8_2.WTextEdit(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); this.setJavaScriptMember( WT_RESIZE_JS, "function(e, w, h, s) { var obj = " diff --git a/src/eu/webtoolkit/jwt/WTimeEdit.java b/src/eu/webtoolkit/jwt/WTimeEdit.java index 331c96ee..da3bb2fd 100644 --- a/src/eu/webtoolkit/jwt/WTimeEdit.java +++ b/src/eu/webtoolkit/jwt/WTimeEdit.java @@ -277,7 +277,7 @@ private void defineJavaScript() { WApplication app = WApplication.getInstance(); app.loadJavaScript("js/WTimeEdit.js", wtjs1()); String jsObj = - "new Wt4_8_1.WTimeEdit(" + "new Wt4_8_2.WTimeEdit(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WTimeValidator.java b/src/eu/webtoolkit/jwt/WTimeValidator.java index 491ee741..c6a478a9 100644 --- a/src/eu/webtoolkit/jwt/WTimeValidator.java +++ b/src/eu/webtoolkit/jwt/WTimeValidator.java @@ -218,7 +218,7 @@ public WValidator.Result validate(final String input) { public String getJavaScriptValidate() { loadJavaScript(WApplication.getInstance()); StringBuilder js = new StringBuilder(); - js.append("new Wt4_8_1.WTimeValidator(").append(this.isMandatory()).append(",["); + js.append("new Wt4_8_2.WTimeValidator(").append(this.isMandatory()).append(",["); for (int i = 0; i < this.formats_.size(); ++i) { WTime.RegExpInfo r = WTime.formatToRegExp(this.formats_.get(i)); if (i != 0) { diff --git a/src/eu/webtoolkit/jwt/WTimerWidget.java b/src/eu/webtoolkit/jwt/WTimerWidget.java index babc6e5c..f64da22b 100644 --- a/src/eu/webtoolkit/jwt/WTimerWidget.java +++ b/src/eu/webtoolkit/jwt/WTimerWidget.java @@ -72,7 +72,7 @@ DomElementType getDomElementType() { String renderRemoveJs(boolean recursive) { return "{var obj=" + this.getJsRef() - + ";if (obj && obj.timer) {clearTimeout(obj.timer);obj.timer = null;}Wt4_8_1.remove('" + + ";if (obj && obj.timer) {clearTimeout(obj.timer);obj.timer = null;}Wt4_8_2.remove('" + this.getId() + "');}"; } diff --git a/src/eu/webtoolkit/jwt/WTransform.java b/src/eu/webtoolkit/jwt/WTransform.java index ccc045c8..3a5971c2 100644 --- a/src/eu/webtoolkit/jwt/WTransform.java +++ b/src/eu/webtoolkit/jwt/WTransform.java @@ -257,7 +257,7 @@ public WPointF map(final WPointF p) { o = p; } result.assignBinding( - o, "Wt4_8_1.gfxUtils.transform_mult(" + this.getJsRef() + ',' + p.getJsRef() + ')'); + o, "Wt4_8_2.gfxUtils.transform_mult(" + this.getJsRef() + ',' + p.getJsRef() + ')'); } return result; } @@ -314,7 +314,7 @@ public WRectF map(final WRectF rect) { o = rect; } result.assignBinding( - o, "Wt4_8_1.gfxUtils.transform_mult(" + this.getJsRef() + ',' + rect.getJsRef() + ')'); + o, "Wt4_8_2.gfxUtils.transform_mult(" + this.getJsRef() + ',' + rect.getJsRef() + ')'); } return result; } @@ -341,7 +341,7 @@ public WPainterPath map(final WPainterPath path) { o = path; } result.assignBinding( - o, "Wt4_8_1.gfxUtils.transform_apply(" + this.getJsRef() + ',' + path.getJsRef() + ')'); + o, "Wt4_8_2.gfxUtils.transform_apply(" + this.getJsRef() + ',' + path.getJsRef() + ')'); } final List sourceSegments = path.getSegments(); for (int i = 0; i < sourceSegments.size(); ++i) { @@ -470,7 +470,7 @@ public WTransform translate(final WPointF p) { } else { this.assignBinding( o, - "Wt4_8_1.gfxUtils.transform_mult((function(){var p=" + "Wt4_8_2.gfxUtils.transform_mult((function(){var p=" + p.getJsRef() + ";return [1,0,0,1,p[0],p[1]];})(),(" + refBefore @@ -494,7 +494,7 @@ public WTransform multiplyAndAssign(final WTransform Y) { o = Y; } this.assignBinding( - o, "Wt4_8_1.gfxUtils.transform_mult(" + this.getJsRef() + ',' + Y.getJsRef() + ')'); + o, "Wt4_8_2.gfxUtils.transform_mult(" + this.getJsRef() + ',' + Y.getJsRef() + ')'); } double z11 = X.m_[M11] * Y.m_[M11] + X.m_[M12] * Y.m_[M21]; double z12 = X.m_[M11] * Y.m_[M12] + X.m_[M12] * Y.m_[M22]; @@ -533,7 +533,7 @@ public WTransform getAdjoint() { this.getM32() * this.getM21() - this.getM31() * this.getM22(), -(this.getM32() * this.getM11() - this.getM31() * this.getM12())); if (this.isJavaScriptBound()) { - res.assignBinding(this, "Wt4_8_1.gfxUtils.transform_adjoint(" + this.getJsRef() + ")"); + res.assignBinding(this, "Wt4_8_2.gfxUtils.transform_adjoint(" + this.getJsRef() + ")"); } return res; } @@ -556,7 +556,7 @@ public WTransform getInverted() { adj.getM31() / det, adj.getM32() / det); if (this.isJavaScriptBound()) { - res.assignBinding(this, "Wt4_8_1.gfxUtils.transform_inverted(" + this.getJsRef() + ")"); + res.assignBinding(this, "Wt4_8_2.gfxUtils.transform_inverted(" + this.getJsRef() + ")"); } return res; } else { diff --git a/src/eu/webtoolkit/jwt/WTreeTable.java b/src/eu/webtoolkit/jwt/WTreeTable.java index 2104ed6d..efc5d482 100644 --- a/src/eu/webtoolkit/jwt/WTreeTable.java +++ b/src/eu/webtoolkit/jwt/WTreeTable.java @@ -254,7 +254,7 @@ private void defineJavaScript() { app.loadJavaScript("js/WTreeTable.js", wtjs1()); this.setJavaScriptMember( " WTreeTable", - "new Wt4_8_1.WTreeTable(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); + "new Wt4_8_2.WTreeTable(" + app.getJavaScriptClass() + "," + this.getJsRef() + ");"); } static WJavaScriptPreamble wtjs1() { diff --git a/src/eu/webtoolkit/jwt/WTreeView.java b/src/eu/webtoolkit/jwt/WTreeView.java index 2e86a573..80787b49 100644 --- a/src/eu/webtoolkit/jwt/WTreeView.java +++ b/src/eu/webtoolkit/jwt/WTreeView.java @@ -565,7 +565,7 @@ public void setRowHeaderCount(int count) { if (useStyleLeft) { boolean rtl = app.getLayoutDirection() == LayoutDirection.RightToLeft; this.tieRowsScrollJS_.setJavaScript( - "function(obj, event) {Wt4_8_1.getCssRule('#" + "function(obj, event) {Wt4_8_2.getCssRule('#" + this.getId() + " .Wt-tv-rowc').style.left= -obj.scrollLeft " + (rtl ? "+ (obj.firstChild.offsetWidth - obj.offsetWidth)" : "") @@ -863,7 +863,7 @@ private void defineJavaScript() { app.loadJavaScript("js/WTreeView.js", wtjs1()); this.setJavaScriptMember( " WTreeView", - "new Wt4_8_1.WTreeView(" + "new Wt4_8_2.WTreeView(" + app.getJavaScriptClass() + "," + this.getJsRef() diff --git a/src/eu/webtoolkit/jwt/WVirtualImage.java b/src/eu/webtoolkit/jwt/WVirtualImage.java index 33159cd1..1a58c347 100644 --- a/src/eu/webtoolkit/jwt/WVirtualImage.java +++ b/src/eu/webtoolkit/jwt/WVirtualImage.java @@ -141,11 +141,11 @@ public void enableDragging() { this.impl_ .mouseWentDown() .addListener( - "function(obj, event) { var pc = Wt4_8_1.pageCoordinates(event); obj.setAttribute('dsx', pc.x); obj.setAttribute('dsy', pc.y);}"); + "function(obj, event) { var pc = Wt4_8_2.pageCoordinates(event); obj.setAttribute('dsx', pc.x); obj.setAttribute('dsy', pc.y);}"); this.impl_ .mouseMoved() .addListener( - "function(obj, event) {var WT= Wt4_8_1;var lastx = obj.getAttribute('dsx');var lasty = obj.getAttribute('dsy');if (lastx != null && lastx != '') {var nowxy = WT.pageCoordinates(event);var img = " + "function(obj, event) {var WT= Wt4_8_2;var lastx = obj.getAttribute('dsx');var lasty = obj.getAttribute('dsy');if (lastx != null && lastx != '') {var nowxy = WT.pageCoordinates(event);var img = " + this.contents_.getJsRef() + ";img.style.left = (WT.pxself(img, 'left')+nowxy.x-lastx) + 'px';img.style.top = (WT.pxself(img, 'top')+nowxy.y-lasty) + 'px';obj.setAttribute('dsx', nowxy.x);obj.setAttribute('dsy', nowxy.y);}}"); this.impl_ diff --git a/src/eu/webtoolkit/jwt/WWebWidget.java b/src/eu/webtoolkit/jwt/WWebWidget.java index 12d07d15..b33b3c5f 100644 --- a/src/eu/webtoolkit/jwt/WWebWidget.java +++ b/src/eu/webtoolkit/jwt/WWebWidget.java @@ -1283,7 +1283,7 @@ void updateDom(final DomElement element, boolean all) { app.addAutoJavaScript( "{var w = " + this.getJsRef() - + ";if (w && !Wt4_8_1.isHidden(w)) {var i = Wt4_8_1.getElement('" + + ";if (w && !Wt4_8_2.isHidden(w)) {var i = Wt4_8_2.getElement('" + i.getId() + "');i.style.width=w.clientWidth + 'px';i.style.height=w.clientHeight + 'px';}}"); element.addChild(i); @@ -1480,7 +1480,7 @@ void updateDom(final DomElement element, boolean all) { } String deferred = this.flags_.get(BIT_TOOLTIP_DEFERRED) ? "true" : "false"; element.callJavaScript( - "Wt4_8_1.toolTip(" + "Wt4_8_2.toolTip(" + app.getJavaScriptClass() + "," + jsStringLiteral(this.getId()) @@ -1543,7 +1543,7 @@ void updateDom(final DomElement element, boolean all) { for (int i = 0; i < this.transientImpl_.childRemoveChanges_.size(); ++i) { final String js = this.transientImpl_.childRemoveChanges_.get(i); if (js.charAt(0) == '_') { - element.callJavaScript("Wt4_8_1.remove('" + js.substring(1) + "');", true); + element.callJavaScript("Wt4_8_2.remove('" + js.substring(1) + "');", true); } else { element.callJavaScript(js, true); } @@ -1693,7 +1693,7 @@ void updateDom(final DomElement element, boolean all) { app.loadJavaScript(THIS_JS, wtjs2()); if (!this.flags_.get(BIT_HIDE_WITH_VISIBILITY)) { StringBuilder ss = new StringBuilder(); - ss.append("Wt4_8_1") + ss.append("Wt4_8_2") .append(".animateDisplay(") .append(app.getJavaScriptClass()) .append(",'") @@ -1715,7 +1715,7 @@ void updateDom(final DomElement element, boolean all) { } } else { StringBuilder ss = new StringBuilder(); - ss.append("Wt4_8_1") + ss.append("Wt4_8_2") .append(".animateVisible('") .append(this.getId()) .append("',") @@ -1782,13 +1782,13 @@ void updateDom(final DomElement element, boolean all) { if (!app.isJavaScriptLoaded(SCROLL_JS) && this.isScrollVisibilityEnabled()) { app.loadJavaScript(SCROLL_JS, wtjs3()); StringBuilder ss = new StringBuilder(); - ss.append("if (!Wt4_8_1.scrollVisibility) {Wt4_8_1.scrollVisibility = new "); - ss.append("Wt4_8_1.ScrollVisibility(").append(app.getJavaScriptClass() + "); }"); + ss.append("if (!Wt4_8_2.scrollVisibility) {Wt4_8_2.scrollVisibility = new "); + ss.append("Wt4_8_2.ScrollVisibility(").append(app.getJavaScriptClass() + "); }"); element.callJavaScript(ss.toString()); } if (this.isScrollVisibilityEnabled()) { StringBuilder ss = new StringBuilder(); - ss.append("Wt4_8_1.scrollVisibility.add({"); + ss.append("Wt4_8_2.scrollVisibility.add({"); ss.append("el:").append(this.getJsRef()).append(','); ss.append("margin:").append(this.getScrollVisibilityMargin()).append(','); ss.append("visible:").append(this.isScrollVisible()); @@ -1798,7 +1798,7 @@ void updateDom(final DomElement element, boolean all) { } else { if (this.flags_.get(BIT_SCROLL_VISIBILITY_LOADED)) { element.callJavaScript( - "Wt4_8_1.scrollVisibility.remove(" + jsStringLiteral(this.getId()) + ");"); + "Wt4_8_2.scrollVisibility.remove(" + jsStringLiteral(this.getId()) + ");"); this.flags_.clear(BIT_SCROLL_VISIBILITY_LOADED); } } @@ -1862,7 +1862,7 @@ String renderRemoveJs(boolean recursive) { final StringBuilder result = new StringBuilder(); if (this.isRendered() && this.isScrollVisibilityEnabled()) { result - .append("Wt4_8_1.scrollVisibility.remove(") + .append("Wt4_8_2.scrollVisibility.remove(") .append(jsStringLiteral(this.getId())) .append(");"); this.flags_.set(BIT_SCROLL_VISIBILITY_CHANGED); @@ -1876,7 +1876,7 @@ String renderRemoveJs(boolean recursive) { if ((result.length() == 0)) { result.append("_").append(this.getId()); } else { - result.append("Wt4_8_1.remove('").append(this.getId()).append("');"); + result.append("Wt4_8_2.remove('").append(this.getId()).append("');"); } } return result.toString(); diff --git a/src/eu/webtoolkit/jwt/WWidget.java b/src/eu/webtoolkit/jwt/WWidget.java index 858c0534..c160280e 100644 --- a/src/eu/webtoolkit/jwt/WWidget.java +++ b/src/eu/webtoolkit/jwt/WWidget.java @@ -428,11 +428,11 @@ public void positionAt(WWidget widget, Orientation orientation) { } String side = orientation == Orientation.Horizontal ? ".Horizontal" : ".Vertical"; this.doJavaScript( - "Wt4_8_1.positionAtWidget('" + "Wt4_8_2.positionAtWidget('" + this.getId() + "','" + widget.getId() - + "',Wt4_8_1" + + "',Wt4_8_2" + side + ");"); } @@ -944,7 +944,7 @@ public void refresh() {} * @see WWidget#isRendered() */ public String getJsRef() { - return "Wt4_8_1.$('" + this.getId() + "')"; + return "Wt4_8_2.$('" + this.getId() + "')"; } /** * Sets an attribute value. diff --git a/src/eu/webtoolkit/jwt/WWidgetCanvasPainter.java b/src/eu/webtoolkit/jwt/WWidgetCanvasPainter.java index 10e00bc4..1138072b 100644 --- a/src/eu/webtoolkit/jwt/WWidgetCanvasPainter.java +++ b/src/eu/webtoolkit/jwt/WWidgetCanvasPainter.java @@ -64,7 +64,7 @@ public void createContents(DomElement result, WPaintDevice device) { WApplication app = WApplication.getInstance(); { StringBuilder ss = new StringBuilder(); - ss.append("new Wt4_8_1.WPaintedWidget(") + ss.append("new Wt4_8_2.WPaintedWidget(") .append(app.getJavaScriptClass()) .append(",") .append(this.widget_.getJsRef()) @@ -74,7 +74,7 @@ public void createContents(DomElement result, WPaintDevice device) { String updateAreasJs = ""; if (hasJsObjects) { StringBuilder ss = new StringBuilder(); - ss.append("new Wt4_8_1.WJavaScriptObjectStorage(") + ss.append("new Wt4_8_2.WJavaScriptObjectStorage(") .append(app.getJavaScriptClass()) .append(",") .append(this.widget_.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/WWidgetVectorPainter.java b/src/eu/webtoolkit/jwt/WWidgetVectorPainter.java index 5f2c2248..f0569717 100644 --- a/src/eu/webtoolkit/jwt/WWidgetVectorPainter.java +++ b/src/eu/webtoolkit/jwt/WWidgetVectorPainter.java @@ -54,7 +54,7 @@ public void updateContents(final List result, WPaintDevice device) { if (this.widget_.repaintFlags_.contains(PaintFlag.Update)) { DomElement painter = DomElement.updateGiven( - "Wt4_8_1.getElement('p" + this.widget_.getId() + "').firstChild", DomElementType.DIV); + "Wt4_8_2.getElement('p" + this.widget_.getId() + "').firstChild", DomElementType.DIV); painter.setProperty(Property.AddedInnerHTML, vectorDevice.getRendered()); WApplication app = WApplication.getInstance(); if (app.getEnvironment().agentIsOpera()) { diff --git a/src/eu/webtoolkit/jwt/WebRenderer.java b/src/eu/webtoolkit/jwt/WebRenderer.java index ff65986d..8be945a7 100644 --- a/src/eu/webtoolkit/jwt/WebRenderer.java +++ b/src/eu/webtoolkit/jwt/WebRenderer.java @@ -585,7 +585,7 @@ private void serveMainscript(final WebResponse response) throws IOException { "SHOW_ERROR", conf.getErrorReporting() == Configuration.ErrorReporting.ErrorMessage); script.setCondition("UGLY_INTERNAL_PATHS", this.session_.isUseUglyInternalPaths()); script.setCondition("DYNAMIC_JS", false); - script.setVar("WT_CLASS", "Wt4_8_1"); + script.setVar("WT_CLASS", "Wt4_8_2"); script.setVar("APP_CLASS", app.getJavaScriptClass()); script.setCondition("STRICTLY_SERIALIZED_EVENTS", conf.serializedEvents()); script.setCondition("WEB_SOCKETS", conf.webSockets()); @@ -652,18 +652,18 @@ private void serveMainscript(final WebResponse response) throws IOException { boolean enabledAjax = app.enableAjax_; if (app.enableAjax_) { this.collectedJS1_ - .append("var form = Wt4_8_1.getElement('Wt-form'); if (form) {") + .append("var form = Wt4_8_2.getElement('Wt-form'); if (form) {") .append(this.beforeLoadJS_.toString()); this.beforeLoadJS_.setLength(0); this.collectedJS1_ .append("var domRoot=") .append(app.domRoot_.getJsRef()) .append(';') - .append("Wt4_8_1.progressed(domRoot);"); + .append("Wt4_8_2.progressed(domRoot);"); int librariesLoaded = this.loadScriptLibraries(this.collectedJS1_, app); app.streamBeforeLoadJavaScript(this.collectedJS1_, false); this.collectedJS2_ - .append("Wt4_8_1.resolveRelativeAnchors();") + .append("Wt4_8_2.resolveRelativeAnchors();") .append("domRoot.style.visibility = 'visible';") .append(app.getJavaScriptClass()) .append("._p_.doAutoJavaScript();"); @@ -964,7 +964,7 @@ private void serveMainAjax(final StringBuilder out) { if (widgetset) { String historyE = app.getEnvironment().getParameter("Wt-history"); if (historyE != null) { - out.append("Wt4_8_1") + out.append("Wt4_8_2") .append(".history.initialize('") .append(historyE.charAt(0)) .append("-field', '") @@ -1189,7 +1189,7 @@ private void collectJavaScriptUpdate(final StringBuilder out) { private void loadStyleSheet( final StringBuilder out, WApplication app, final WLinkedCssStyleSheet sheet) { - out.append("Wt4_8_1") + out.append("Wt4_8_2") .append(".addStyleSheet('") .append(sheet.getLink().resolveUrl(app)) .append("', '") @@ -1208,7 +1208,7 @@ private void loadStyleSheets(final StringBuilder out, WApplication app) { private void removeStyleSheets(final StringBuilder out, WApplication app) { for (int i = (int) app.styleSheetsToRemove_.size() - 1; i > -1; --i) { - out.append("Wt4_8_1") + out.append("Wt4_8_2") .append(".removeStyleSheet('") .append(app.styleSheetsToRemove_.get(i).getLink().resolveUrl(app)) .append("');\n "); diff --git a/src/eu/webtoolkit/jwt/WebSession.java b/src/eu/webtoolkit/jwt/WebSession.java index bade7ccc..25cd69f1 100644 --- a/src/eu/webtoolkit/jwt/WebSession.java +++ b/src/eu/webtoolkit/jwt/WebSession.java @@ -1709,7 +1709,7 @@ public void setLoaded() { this.setState(WebSession.State.Loaded, this.controller_.getConfiguration().getSessionTimeout()); if (wasSuspended) { if (this.env_.hasAjax() && this.controller_.getConfiguration().reloadIsNewSession()) { - this.app_.doJavaScript("Wt4_8_1.history.removeSessionId()"); + this.app_.doJavaScript("Wt4_8_2.history.removeSessionId()"); this.sessionIdInUrl_ = false; } this.app_.unsuspended().trigger(); @@ -2106,7 +2106,7 @@ private void notifySignal(final WEvent e) throws IOException { String hashE = request.getParameter(se + "_"); if (hashE != null) { this.changeInternalPath(hashE, handler.getResponse()); - this.app_.doJavaScript("Wt4_8_1.scrollHistory();"); + this.app_.doJavaScript("Wt4_8_2.scrollHistory();"); } else { this.changeInternalPath("", handler.getResponse()); } diff --git a/src/eu/webtoolkit/jwt/auth/AuthModel.java b/src/eu/webtoolkit/jwt/auth/AuthModel.java index b86593ec..5fdb1a2d 100644 --- a/src/eu/webtoolkit/jwt/auth/AuthModel.java +++ b/src/eu/webtoolkit/jwt/auth/AuthModel.java @@ -188,7 +188,7 @@ public void configureThrottling(WInteractWidget button) { app.loadJavaScript("js/AuthModel.js", wtjs1()); button.setJavaScriptMember( " AuthThrottle", - "new Wt4_8_1.AuthThrottle(Wt4_8_1," + "new Wt4_8_2.AuthThrottle(Wt4_8_2," + button.getJsRef() + "," + WString.toWString(WString.tr("Wt.Auth.throttle-retry")).getJsStringLiteral() diff --git a/src/eu/webtoolkit/jwt/auth/OAuthProcess.java b/src/eu/webtoolkit/jwt/auth/OAuthProcess.java index d9a24a5e..fc88d1e1 100644 --- a/src/eu/webtoolkit/jwt/auth/OAuthProcess.java +++ b/src/eu/webtoolkit/jwt/auth/OAuthProcess.java @@ -137,7 +137,7 @@ public void connectStartAuthenticate(final AbstractEventSignal s) { && this.service_.isPopupEnabled()) { StringBuilder js = new StringBuilder(); js.append("function(object, event) {") - .append("Wt4_8_1.PopupWindow(Wt4_8_1") + .append("Wt4_8_2.PopupWindow(Wt4_8_2") .append(",") .append(WWebWidget.jsStringLiteral(this.getAuthorizeUrl())) .append(", ") diff --git a/src/eu/webtoolkit/jwt/auth/RegistrationModel.java b/src/eu/webtoolkit/jwt/auth/RegistrationModel.java index 66b2dae7..96856c0c 100644 --- a/src/eu/webtoolkit/jwt/auth/RegistrationModel.java +++ b/src/eu/webtoolkit/jwt/auth/RegistrationModel.java @@ -516,9 +516,9 @@ public static void validatePasswordsMatchJS( + info2.getJsRef() + ",o1=" + password.getJsRef() - + ";if (!$(o1).hasClass('Wt-invalid')) {if (o.value == o1.value) {$(o).removeClass('Wt-invalid');Wt4_8_1.setHtml(i," + + ";if (!$(o1).hasClass('Wt-invalid')) {if (o.value == o1.value) {$(o).removeClass('Wt-invalid');Wt4_8_2.setHtml(i," + WString.toWString(WString.tr("Wt.Auth.valid")).getJsStringLiteral() - + ");} else {$(o).removeClass('Wt-valid');Wt4_8_1.setHtml(i," + + ");} else {$(o).removeClass('Wt-valid');Wt4_8_2.setHtml(i," + WString.toWString(WString.tr("Wt.Auth.repeat-password-info")).getJsStringLiteral() + ");}}}"); } diff --git a/src/eu/webtoolkit/jwt/chart/WAxisSliderWidget.java b/src/eu/webtoolkit/jwt/chart/WAxisSliderWidget.java index 164e47ae..5e69eae8 100644 --- a/src/eu/webtoolkit/jwt/chart/WAxisSliderWidget.java +++ b/src/eu/webtoolkit/jwt/chart/WAxisSliderWidget.java @@ -635,7 +635,7 @@ protected void paintEvent(WPaintDevice paintDevice) { if (this.getMethod() == RenderMethod.HtmlCanvas) { WApplication app = WApplication.getInstance(); StringBuilder ss = new StringBuilder(); - ss.append("new Wt4_8_1.WAxisSliderWidget(") + ss.append("new Wt4_8_2.WAxisSliderWidget(") .append(app.getJavaScriptClass()) .append(",") .append(this.getJsRef()) diff --git a/src/eu/webtoolkit/jwt/chart/WCartesianChart.java b/src/eu/webtoolkit/jwt/chart/WCartesianChart.java index 71686181..f7b4b655 100644 --- a/src/eu/webtoolkit/jwt/chart/WCartesianChart.java +++ b/src/eu/webtoolkit/jwt/chart/WCartesianChart.java @@ -3079,7 +3079,7 @@ protected void paintEvent(WPaintDevice paintDevice) { int selectedCurve = this.selectedSeries_ != null ? this.getSeriesIndexOf(this.selectedSeries_) : -1; int followCurve = this.followCurve_ != null ? this.getSeriesIndexOf(this.followCurve_) : -1; - ss.append("new Wt4_8_1.WCartesianChart(") + ss.append("new Wt4_8_2.WCartesianChart(") .append(app.getJavaScriptClass()) .append(",") .append(this.getJsRef()) @@ -5864,8 +5864,8 @@ private void defineJavaScript() { if (app != null && (this.isInteractive() || this.hasDeferredToolTips_)) { app.loadJavaScript("js/ChartCommon.js", wtjs2()); app.doJavaScript( - "if (!Wt4_8_1.chartCommon) {Wt4_8_1.chartCommon = new " - + "Wt4_8_1.ChartCommon(" + "if (!Wt4_8_2.chartCommon) {Wt4_8_2.chartCommon = new " + + "Wt4_8_2.ChartCommon(" + app.getJavaScriptClass() + "); }", false);