Merge remote-tracking branch 'origin/master'

Conflicts: src/main/webapp/app/mainMenu.zul
2015-02-23 22:28:14 +01:00
parent 1d2810f78d c4f5671327
commit 48d2c75d7b
2 changed files with 117 additions and 118 deletions
@@ -18,7 +18,7 @@
                    <vbox>
                        <image src="/img/lucene_logo.png"/>
                        <hbox>
-                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px"
+                            <textbox value="@bind(vm.keyWord)" instant="true" width="250px" onCreate="self.setFocus(true)"
                                     onOK="@command('doSearch')"/>
                            <button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
                                    image="/img/search.png"/>