]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoFix issues caused by 6.8 merge: prevent NPE with componentStyles; ensure split positi...
Johannes Dahlström [Tue, 19 Jun 2012 10:42:11 +0000 (13:42 +0300)]
Fix issues caused by 6.8 merge: prevent NPE with componentStyles; ensure split position limits are properly set; ensure panels are scrollable after state change

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Tue, 19 Jun 2012 08:24:20 +0000 (11:24 +0300)]
Merge remote-tracking branch 'origin/master'

12 years agoDeprecate @LoadScripts to signal that it's a temporary hack (#8888)
Leif Åstrand [Mon, 18 Jun 2012 11:01:29 +0000 (14:01 +0300)]
Deprecate @LoadScripts to signal that it's a temporary hack (#8888)

12 years agoRemove method accidentally left behind (#6730)
Leif Åstrand [Fri, 15 Jun 2012 11:50:11 +0000 (14:50 +0300)]
Remove method accidentally left behind (#6730)

12 years agoAdd API for getting the parent connector's id (#8888)
Leif Åstrand [Fri, 15 Jun 2012 10:56:10 +0000 (13:56 +0300)]
Add API for getting the parent connector's id (#8888)

12 years agoAdd support for getting the dom element for any connector id (#8888)
Leif Åstrand [Fri, 15 Jun 2012 10:39:26 +0000 (13:39 +0300)]
Add support for getting the dom element for any connector id (#8888)

12 years agoAdd support for callbacks in other objects (e.g. "foo.bar") (#6730)
Leif Åstrand [Fri, 15 Jun 2012 09:44:01 +0000 (12:44 +0300)]
Add support for callbacks in other objects (e.g. "foo.bar") (#6730)

12 years agoProperly pass arguments from the server to the callbacks (#8888)
Leif Åstrand [Fri, 15 Jun 2012 09:18:48 +0000 (12:18 +0300)]
Properly pass arguments from the server to the callbacks (#8888)

12 years agoAdd StateChangeHandler in init to come after component handler (#8888)
Leif Åstrand [Fri, 15 Jun 2012 09:10:54 +0000 (12:10 +0300)]
Add StateChangeHandler in init to come after component handler (#8888)

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Fri, 15 Jun 2012 08:18:46 +0000 (11:18 +0300)]
Merge remote-tracking branch 'origin/master'

Conflicts:
src/com/vaadin/terminal/gwt/server/DragAndDropService.java

12 years agoAdd missing Serializable
Leif Åstrand [Fri, 15 Jun 2012 07:13:44 +0000 (10:13 +0300)]
Add missing Serializable

12 years agoAdd missing $entry
Leif Åstrand [Fri, 15 Jun 2012 07:13:08 +0000 (10:13 +0300)]
Add missing $entry

12 years agoImplement js rpc proxy objects and wildcard rpc support (#8888)
Leif Åstrand [Thu, 14 Jun 2012 19:57:28 +0000 (22:57 +0300)]
Implement js rpc proxy objects and wildcard rpc support (#8888)

12 years agoUse callbacks directly as fields in connector object (#8888)
Leif Åstrand [Thu, 14 Jun 2012 18:18:49 +0000 (21:18 +0300)]
Use callbacks directly as fields in connector object (#8888)

12 years agoRename Javascript -> JavaScript
Leif Åstrand [Thu, 14 Jun 2012 14:42:04 +0000 (17:42 +0300)]
Rename Javascript -> JavaScript

12 years agoJavascriptManager -> JavaScript and changes based on review (#6730)
Leif Åstrand [Thu, 14 Jun 2012 14:29:49 +0000 (17:29 +0300)]
JavascriptManager -> JavaScript and changes based on review (#6730)

12 years agoChange package name in js file not changed by previous refactoring
Leif Åstrand [Thu, 14 Jun 2012 14:23:44 +0000 (17:23 +0300)]
Change package name in js file not changed by previous refactoring

12 years agoAdd shorthand for removing an Extension from its target (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:39:41 +0000 (13:39 +0300)]
Add shorthand for removing an Extension from its target (#6690)

12 years agoRequire all Connectors to be either Components or Extensions (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:39:13 +0000 (13:39 +0300)]
Require all Connectors to be either Components or Extensions (#6690)

12 years agoFile missing from previous commit (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:34:59 +0000 (13:34 +0300)]
File missing from previous commit (#6690)

12 years agoTweaks to Extension API based on review (#6690)
Leif Åstrand [Thu, 14 Jun 2012 10:27:34 +0000 (13:27 +0300)]
Tweaks to Extension API based on review (#6690)

12 years agoFixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application
Johannes Dahlström [Wed, 13 Jun 2012 15:17:45 +0000 (18:17 +0300)]
Fixed some errors caused by 6.8 merge; updated tests to use LegacyWindow/Application

12 years agoMerge remote-tracking branch 'origin/master'
Johannes Dahlström [Wed, 13 Jun 2012 14:46:09 +0000 (17:46 +0300)]
Merge remote-tracking branch 'origin/master'

Conflicts:
src/com/vaadin/terminal/gwt/server/DragAndDropService.java

12 years agoMerge commit '62362'
Johannes Dahlström [Tue, 12 Jun 2012 14:21:52 +0000 (17:21 +0300)]
Merge commit '62362'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

12 years agoMerge commit '39848'
Johannes Dahlström [Tue, 12 Jun 2012 14:20:09 +0000 (17:20 +0300)]
Merge commit '39848'

Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

12 years agoMerge commit '0a7f33'
Johannes Dahlström [Tue, 12 Jun 2012 14:15:41 +0000 (17:15 +0300)]
Merge commit '0a7f33'

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java

12 years agoMerge commit '948b55'
Johannes Dahlström [Tue, 12 Jun 2012 14:14:54 +0000 (17:14 +0300)]
Merge commit '948b55'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

12 years agoMerge commit 'f8cb0'
Johannes Dahlström [Tue, 12 Jun 2012 14:14:05 +0000 (17:14 +0300)]
Merge commit 'f8cb0'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

12 years agoMerge commit '17c14'
Johannes Dahlström [Tue, 12 Jun 2012 14:05:23 +0000 (17:05 +0300)]
Merge commit '17c14'

Conflicts:
src/com/vaadin/Application.java
src/com/vaadin/data/util/MethodPropertyDescriptor.java
src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/server/DragAndDropService.java
src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java

12 years agoMerge commit 'abdc1'
Johannes Dahlström [Tue, 12 Jun 2012 13:36:04 +0000 (16:36 +0300)]
Merge commit 'abdc1'

Conflicts:
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java

12 years agoMerge commit '6f729'
Johannes Dahlström [Tue, 12 Jun 2012 13:31:55 +0000 (16:31 +0300)]
Merge commit '6f729'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/ui/AbstractSplitPanel.java

12 years agoMerge commit 'e978b99'
Johannes Dahlström [Tue, 12 Jun 2012 13:27:21 +0000 (16:27 +0300)]
Merge commit 'e978b99'

12 years agoMerge commit '11322'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:45 +0000 (16:26 +0300)]
Merge commit '11322'

12 years agoMerge commit '42dff'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:36 +0000 (16:26 +0300)]
Merge commit '42dff'

12 years agoMerge commit '6e9601'
Johannes Dahlström [Tue, 12 Jun 2012 13:26:30 +0000 (16:26 +0300)]
Merge commit '6e9601'

Conflicts:
WebContent/release-notes.html

12 years agoRefresh row cache in requestRepaintAll to avoid partial repaint (#8714)
Leif Åstrand [Tue, 12 Jun 2012 13:14:19 +0000 (16:14 +0300)]
Refresh row cache in requestRepaintAll to avoid partial repaint (#8714)

12 years agoMerge commit '56d0c'
Johannes Dahlström [Tue, 12 Jun 2012 13:09:25 +0000 (16:09 +0300)]
Merge commit '56d0c'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/ui/AbstractSplitPanel.java

12 years agoTest app for #8714
Leif Åstrand [Tue, 12 Jun 2012 13:00:17 +0000 (16:00 +0300)]
Test app for #8714

12 years agoRename feature -> extension in test classes
Leif Åstrand [Tue, 12 Jun 2012 12:34:09 +0000 (15:34 +0300)]
Rename feature -> extension in test classes

12 years agoNavigator API changes based on review (#8859)
Henri Sara [Tue, 12 Jun 2012 11:17:41 +0000 (14:17 +0300)]
Navigator API changes based on review (#8859)

- Simplify the default providers and move addView()/removeView() logic
to Navigator itself.
- use longest matching view name to manage view hierarchy
- minor cleanup

12 years agoSome Navigator API changes based on review (#8859).
Henri Sara [Mon, 11 Jun 2012 11:57:19 +0000 (14:57 +0300)]
Some Navigator API changes based on review (#8859).

The changes in this changeset include
- remove the concept of main view (use empty view name)
- remove View.init()
- use ViewChangeEvent in ViewChangeListener
- remove internal parameters
- add getDisplay() and a constructor that creates a SimpleViewDisplay by
default

12 years agoFix typo
Leif Åstrand [Tue, 12 Jun 2012 10:51:27 +0000 (13:51 +0300)]
Fix typo

12 years agoChange api to use callback instead or rpc for js callbacks (#8888)
Leif Åstrand [Tue, 12 Jun 2012 10:03:22 +0000 (13:03 +0300)]
Change api to use callback instead or rpc for js callbacks (#8888)

Also change JavascriptCallback.call to throw JSONException

12 years agoCall request repaint after manually triggering rpc (#8888)
Leif Åstrand [Tue, 12 Jun 2012 09:11:50 +0000 (12:11 +0300)]
Call request repaint after manually triggering rpc (#8888)

12 years agoFix typo
Leif Åstrand [Tue, 12 Jun 2012 07:50:59 +0000 (10:50 +0300)]
Fix typo

12 years agoAdd support for simplified RPC communication with JS code (#8888)
Leif Åstrand [Tue, 12 Jun 2012 07:41:51 +0000 (10:41 +0300)]
Add support for simplified RPC communication with JS code (#8888)

12 years agoShow better message when RPC method is not found
Leif Åstrand [Tue, 12 Jun 2012 07:37:15 +0000 (10:37 +0300)]
Show better message when RPC method is not found

12 years agoSupport sending raw JSON values (#8888)
Leif Åstrand [Tue, 12 Jun 2012 07:36:54 +0000 (10:36 +0300)]
Support sending raw JSON values (#8888)

12 years agoInitial javascript callback support (#6730)
Leif Åstrand [Mon, 11 Jun 2012 18:52:26 +0000 (21:52 +0300)]
Initial javascript callback support (#6730)

12 years agoInitial support for javascript components (#8888)
Leif Åstrand [Sun, 10 Jun 2012 12:10:10 +0000 (15:10 +0300)]
Initial support for javascript components (#8888)

12 years agoRename addExtensionTo -> attachTo (#6690)
Leif Åstrand [Mon, 11 Jun 2012 16:53:59 +0000 (19:53 +0300)]
Rename addExtensionTo -> attachTo (#6690)

12 years agoMerge commit '61638'
Johannes Dahlström [Mon, 11 Jun 2012 15:16:29 +0000 (18:16 +0300)]
Merge commit '61638'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java
tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html

12 years agoMerge commit '6d07c'
Johannes Dahlström [Mon, 11 Jun 2012 14:57:38 +0000 (17:57 +0300)]
Merge commit '6d07c'

12 years agoMerge commit 'bc630'
Johannes Dahlström [Mon, 11 Jun 2012 14:57:01 +0000 (17:57 +0300)]
Merge commit 'bc630'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

12 years agoMerge commit '165544'
Johannes Dahlström [Mon, 11 Jun 2012 14:49:45 +0000 (17:49 +0300)]
Merge commit '165544'

12 years agoMerge commit '8e5b5'
Johannes Dahlström [Mon, 11 Jun 2012 14:49:03 +0000 (17:49 +0300)]
Merge commit '8e5b5'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java

12 years agoMerge commit 'bb48c'
Johannes Dahlström [Mon, 11 Jun 2012 14:45:52 +0000 (17:45 +0300)]
Merge commit 'bb48c'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java

12 years agoMerge commit 'cb20a6'
Johannes Dahlström [Mon, 11 Jun 2012 14:41:13 +0000 (17:41 +0300)]
Merge commit 'cb20a6'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

12 years agoMerge commit 'b0210'
Johannes Dahlström [Mon, 11 Jun 2012 13:39:55 +0000 (16:39 +0300)]
Merge commit 'b0210'

12 years agoMerge commit 'edf451'
Johannes Dahlström [Mon, 11 Jun 2012 13:39:39 +0000 (16:39 +0300)]
Merge commit 'edf451'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java

12 years agoMerge commit 'e8a652'
Johannes Dahlström [Mon, 11 Jun 2012 12:59:39 +0000 (15:59 +0300)]
Merge commit 'e8a652'

12 years agoMerge commit 'e8844'
Johannes Dahlström [Mon, 11 Jun 2012 12:59:16 +0000 (15:59 +0300)]
Merge commit 'e8844'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

12 years agoMerge commit '9fc49'
Johannes Dahlström [Mon, 11 Jun 2012 12:34:29 +0000 (15:34 +0300)]
Merge commit '9fc49'

12 years agoMerge commit '35b979'
Johannes Dahlström [Mon, 11 Jun 2012 12:34:11 +0000 (15:34 +0300)]
Merge commit '35b979'

12 years agoMerge commit '375f73'
Johannes Dahlström [Mon, 11 Jun 2012 12:34:01 +0000 (15:34 +0300)]
Merge commit '375f73'

Conflicts:
tests/test.xml

12 years agoMerge commit 'e7f31'
Johannes Dahlström [Mon, 11 Jun 2012 12:31:37 +0000 (15:31 +0300)]
Merge commit 'e7f31'

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java

12 years agoMerge commit 'e085e'
Johannes Dahlström [Mon, 11 Jun 2012 11:43:48 +0000 (14:43 +0300)]
Merge commit 'e085e'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java
tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java

12 years agoMerge commit 'bec62'
Johannes Dahlström [Mon, 11 Jun 2012 11:26:55 +0000 (14:26 +0300)]
Merge commit 'bec62'

Conflicts:
WebContent/VAADIN/themes/base/common/common.css
src/com/vaadin/terminal/gwt/client/ui/button/VButton.java
src/com/vaadin/ui/Button.java

12 years agoMerge commit '99786'
Johannes Dahlström [Mon, 11 Jun 2012 11:18:27 +0000 (14:18 +0300)]
Merge commit '99786'

Conflicts:
src/com/vaadin/ui/TabSheet.java

12 years agoMerge commit 'ecd026'
Johannes Dahlström [Mon, 11 Jun 2012 11:17:13 +0000 (14:17 +0300)]
Merge commit 'ecd026'

Conflicts:
src/com/vaadin/ui/TreeTable.java

12 years agoMerge commit 'b5486'
Johannes Dahlström [Mon, 11 Jun 2012 11:12:22 +0000 (14:12 +0300)]
Merge commit 'b5486'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

12 years agoMerge commit 'adf89'
Johannes Dahlström [Mon, 11 Jun 2012 11:11:12 +0000 (14:11 +0300)]
Merge commit 'adf89'

12 years agoMerge commit 'a21464'
Johannes Dahlström [Mon, 11 Jun 2012 11:11:04 +0000 (14:11 +0300)]
Merge commit 'a21464'

12 years agoFix accidentally committed file with unresolved conflicts
Johannes Dahlström [Mon, 11 Jun 2012 11:10:12 +0000 (14:10 +0300)]
Fix accidentally committed file with unresolved conflicts

12 years agoMerge commit '8b064'
Johannes Dahlström [Mon, 11 Jun 2012 11:08:31 +0000 (14:08 +0300)]
Merge commit '8b064'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java

12 years agoMerge commit '0ec349'
Johannes Dahlström [Mon, 11 Jun 2012 11:06:49 +0000 (14:06 +0300)]
Merge commit '0ec349'

12 years agoMerge commit 'c03c4'
Johannes Dahlström [Mon, 11 Jun 2012 11:06:40 +0000 (14:06 +0300)]
Merge commit 'c03c4'

12 years agoMerge commit '22652b'
Johannes Dahlström [Mon, 11 Jun 2012 11:06:30 +0000 (14:06 +0300)]
Merge commit '22652b'

12 years agoMerge commit '9ae6c'
Johannes Dahlström [Mon, 11 Jun 2012 11:06:15 +0000 (14:06 +0300)]
Merge commit '9ae6c'

12 years agoMerge commit '321b4'
Johannes Dahlström [Mon, 11 Jun 2012 11:05:36 +0000 (14:05 +0300)]
Merge commit '321b4'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

12 years agoMerge commit '38263'
Johannes Dahlström [Mon, 11 Jun 2012 11:04:13 +0000 (14:04 +0300)]
Merge commit '38263'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java

12 years agoMerge commit 'ac2008'
Johannes Dahlström [Mon, 11 Jun 2012 11:02:19 +0000 (14:02 +0300)]
Merge commit 'ac2008'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java

12 years agoMerge commit '716de'
Johannes Dahlström [Mon, 11 Jun 2012 11:00:15 +0000 (14:00 +0300)]
Merge commit '716de'

12 years agoMerge commit '95e0de'
Johannes Dahlström [Mon, 11 Jun 2012 11:00:03 +0000 (14:00 +0300)]
Merge commit '95e0de'

12 years agoMerge commit 'b50dcc'
Johannes Dahlström [Mon, 11 Jun 2012 10:58:57 +0000 (13:58 +0300)]
Merge commit 'b50dcc'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java

12 years agoMerge commit '16c91'
Johannes Dahlström [Mon, 11 Jun 2012 10:57:44 +0000 (13:57 +0300)]
Merge commit '16c91'

12 years agoMerge commit 'f560e'
Johannes Dahlström [Mon, 11 Jun 2012 10:57:38 +0000 (13:57 +0300)]
Merge commit 'f560e'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java

12 years agoMerge commit '239aad'
Johannes Dahlström [Mon, 11 Jun 2012 10:53:06 +0000 (13:53 +0300)]
Merge commit '239aad'

Conflicts:
WebContent/VAADIN/themes/base/panel/panel.css

12 years agoMerge commit 'bb486'
Johannes Dahlström [Mon, 11 Jun 2012 10:51:23 +0000 (13:51 +0300)]
Merge commit 'bb486'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java

12 years agoMerge commit '8383b'
Johannes Dahlström [Mon, 11 Jun 2012 10:49:15 +0000 (13:49 +0300)]
Merge commit '8383b'

12 years agoMerge commit '0c4034'
Johannes Dahlström [Mon, 11 Jun 2012 10:49:06 +0000 (13:49 +0300)]
Merge commit '0c4034'

12 years agoMerge commit '33371'
Johannes Dahlström [Mon, 11 Jun 2012 10:48:50 +0000 (13:48 +0300)]
Merge commit '33371'

12 years agoFixed a broken merge
Johannes Dahlström [Mon, 11 Jun 2012 10:47:19 +0000 (13:47 +0300)]
Fixed a broken merge

12 years agoMerge commit 'c8a4ca'
Johannes Dahlström [Mon, 11 Jun 2012 10:42:57 +0000 (13:42 +0300)]
Merge commit 'c8a4ca'

12 years agoMerge commit 'f6bfd'
Johannes Dahlström [Mon, 11 Jun 2012 10:42:16 +0000 (13:42 +0300)]
Merge commit 'f6bfd'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java

12 years agoMerge commit 'd53b6'
Johannes Dahlström [Mon, 11 Jun 2012 10:39:43 +0000 (13:39 +0300)]
Merge commit 'd53b6'

12 years agoMerge commit '0bcee'
Johannes Dahlström [Mon, 11 Jun 2012 10:39:33 +0000 (13:39 +0300)]
Merge commit '0bcee'

12 years agoMerge commit '2f9e5'
Johannes Dahlström [Mon, 11 Jun 2012 10:39:26 +0000 (13:39 +0300)]
Merge commit '2f9e5'

12 years agoMerge commit 'af1952'
Johannes Dahlström [Mon, 11 Jun 2012 10:39:18 +0000 (13:39 +0300)]
Merge commit 'af1952'

12 years agoMerge commit '8cfb8'
Johannes Dahlström [Mon, 11 Jun 2012 10:39:07 +0000 (13:39 +0300)]
Merge commit '8cfb8'