http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b906dbc/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery-shim.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery-shim.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery-shim.js new file mode 100644 index 0000000..7487335 --- /dev/null +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery-shim.js @@ -0,0 +1,17 @@ +// Copyright 2012 The Apache Software Foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http:#www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +define(["jquery-library"], function () { + return $.noConflict(); +});
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b906dbc/tapestry-core/src/test/app1/AutocompleteDemo.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/app1/AutocompleteDemo.tml b/tapestry-core/src/test/app1/AutocompleteDemo.tml index 8dfdfee..18b0b9f 100644 --- a/tapestry-core/src/test/app1/AutocompleteDemo.tml +++ b/tapestry-core/src/test/app1/AutocompleteDemo.tml @@ -1,19 +1,21 @@ <t:border xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";> <h1>Autocomplete Mixin Demo</h1> - <t:form> + <t:form class="form-horizontal"> + <t:errors/> - <div class="t-beaneditor"> - <div class="t-beaneditor-row"> - <t:label for="title"/> + <div class="control-group"> + <t:label class="control-label" for="title"/> + <div class="controls"> <t:textfield t:id="title" t:mixins="autocomplete" tokens=",;" size="60"/> </div> + </div> - <div class="t-beaneditor-row"> - <input type="submit" value="Show Track"/> - </div> + <div class="form-actions"> + <input type="submit" class="btn btn-primary" value="Show Track"/> </div> + </t:form>
