@@ -1 +1 @@ -Subproject commit 988e4cbafb3b45b91e80f96947afa0c217ca32e8 +Subproject commit f46ae6877af6fd02125f8d61bf953413ae115fbf lib/pdoc @@ -21,7 +21,7 @@ UI.AutoComplete = Class.create(UI.Options, { delay: 0.2, // Delay before running ajax request shadow: false, // Shadow theme name (false = no shadow) highlight: false, // Highlight search string in list - tokens: false, // Tokens used to automatically adds a new entry (ex tokens:[',', ' '] for coma and spaces) + tokens: false, // Tokens used to automatically adds a new entry (ex tokens:[KEY_COMA, KEY_SPACE] for coma and spaces) unique: true // Do not display in suggestion a selected value }, @@ -515,20 +515,29 @@ UI.AutoComplete = Class.create(UI.Options, { updateSelectedText: function() { var selected = this.container.select("li." + this.getClassName("box")); var content = selected.collect(function(element) {return element.down("span").firstChild.textContent}); - var separator = this.options.tokens ? this.options.tokens.first() : " "; + var separator = this.getSeparatorChar(); this.selectedText = content.empty() ? false : content.join(separator); return this; }, updateHiddenField: function() { - var separator = this.options.tokens ? this.options.tokens.first() : " "; + var separator = this.getSeparatorChar(); this.hidden.value = this.selectedText ? $A([this.selectedText, this.input.value]).join(separator) : this.input.value; }, selectedValues: function() { var selected = this.container.select("li." + this.getClassName("box")); return selected.collect(function(element) {return element.readAttribute("pui-autocomplete:value")}); + }, + + getSeparatorChar: function() { + var separator = this.options.tokens ? this.options.tokens.first() : " "; + if (separator == Event.KEY_COMA) + separator = ','; + if (separator == Event.KEY_SPACE) + separator = ' '; + return separator; } }); src/auto_complete/auto_complete.js @@ -3,4 +3,18 @@ * The Carousel section **/ +/** section: Carousel + * Carousel + * + * blablabla + **/ + +/** section: Carousel + * new UI.Carousel(element, options) + * the Ajax Request constructor + **/ + +/** section: Carousel + * class UI.Carousel + **/ src/carousel/documentation.pdoc @@ -36,7 +36,7 @@ var CSS = (function() { }; // Fixes a stylesheet - function fixStylesheet(stylesheet, method) { + function fixStylesheet(stylesheet, method) { // Parse import files if (stylesheet.imports) $A(stylesheet.imports).each(fixStylesheet); @@ -119,6 +119,10 @@ var CSS = (function() { }, preloadImages: function() { + // Does not work with FF3!! + if (navigator.userAgent.match(/Firefox\/3/)) + return; + parseStylesheet.apply(this, $A(arguments).concat(preloadRule)); } }; src/util/css.js @@ -30,7 +30,7 @@ </form> <br/><br/> <script type="text/javascript"> - document.whenReady(function() { + Event.observe(window, 'load', function() { ac = new UI.AutoComplete('pui-demo', { shadow: "auto_complete", tokens: Event.KEY_COMA, max: {selection: 10, selected:5} test/functional/auto_complete/test_auto_complete_token.html 43637ab7afca0f7e43dd3818a084df5b1f2bbaf3 sgruhier sgruhier@mac.com http://github.com/xilinus/prototypeui/commit/bd14194a011bdc60796135e583045fea5ba7eb6f bd14194a011bdc60796135e583045fea5ba7eb6f 2008-07-20T04:32:44-07:00 2008-07-20T04:32:44-07:00 fix FF3 and debug tokens serialisation in auto-complete 978cf45382051436454133cd10968027a50a2d9a sgruhier sgruhier@mac.com