Merge branch 'catalog'

Conflicts: core/lib/Thelia/Config/Resources/config.xml core/lib/Thelia/Config/Resources/routing/admin.xml core/lib/Thelia/Core/Template/Loop/Country.php core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php core/lib/Thelia/Model/Country.php core/lib/Thelia/Model/Profile.php core/lib/Thelia/Model/ProfileQuery.php install/insert.sql install/thelia.sql local/config/schema.xml
2013-10-24 00:16:33 +02:00
parent fa99482f46 7ca2399573
commit 5bf51dd47e
38 changed files with 3324 additions and 1903 deletions
--- a/templates/admin/default/assets/js/jquery.typewatch.js
+++ b/templates/admin/default/assets/js/jquery.typewatch.js
@@ -0,0 +1,94 @@
+/*
+*        TypeWatch 2.2
+*
+*        Examples/Docs: github.com/dennyferra/TypeWatch
+*
+* Copyright(c) 2013
+*        Denny Ferrassoli - dennyferra.com
+* Charles Christolini
+*
+* Dual licensed under the MIT and GPL licenses:
+* http://www.opensource.org/licenses/mit-license.php
+* http://www.gnu.org/licenses/gpl.html
+*/
+
+(function(jQuery) {
+        jQuery.fn.typeWatch = function(o) {
+                // The default input types that are supported
+                var _supportedInputTypes =
+                        ['TEXT', 'TEXTAREA', 'PASSWORD', 'TEL', 'SEARCH', 'URL', 'EMAIL', 'DATETIME', 'DATE', 'MONTH', 'WEEK', 'TIME', 'DATETIME-LOCAL', 'NUMBER', 'RANGE'];
+
+                // Options
+                var options = jQuery.extend({
+                        wait: 750,
+                        callback: function() { },
+                        highlight: true,
+                        captureLength: 2,
+                        inputTypes: _supportedInputTypes
+                }, o);
+
+                function checkElement(timer, override) {
+                        var value = jQuery(timer.el).val();
+
+                        // Fire if text >= options.captureLength AND text != saved text OR if override AND text >= options.captureLength
+                        if ((value.length >= options.captureLength && value.toUpperCase() != timer.text)
+                                || (override && value.length >= options.captureLength))
+                        {
+                                timer.text = value.toUpperCase();
+                                timer.cb.call(timer.el, value);
+                        }
+                };
+
+                function watchElement(elem) {
+                        var elementType = elem.type.toUpperCase();
+                        if (jQuery.inArray(elementType, options.inputTypes) >= 0) {
+
+                                // Allocate timer element
+                                var timer = {
+                                        timer: null,
+                                        text: jQuery(elem).val().toUpperCase(),
+                                        cb: options.callback,
+                                        el: elem,
+                                        wait: options.wait
+                                };
+
+                                // Set focus action (highlight)
+                                if (options.highlight) {
+                                        jQuery(elem).focus(
+                                                function() {
+                                                        this.select();
+                                                });
+                                }
+
+                                // Key watcher / clear and reset the timer
+                                var startWatch = function(evt) {
+                                        var timerWait = timer.wait;
+                                        var overrideBool = false;
+                                        var evtElementType = this.type.toUpperCase();
+
+                                        // If enter key is pressed and not a TEXTAREA and matched inputTypes
+                                        if (typeof evt.keyCode != 'undefined' && evt.keyCode == 13 && evtElementType != 'TEXTAREA' && jQuery.inArray(evtElementType, options.inputTypes) >= 0) {
+                                                timerWait = 1;
+                                                overrideBool = true;
+                                        }
+
+                                        var timerCallbackFx = function() {
+                                                checkElement(timer, overrideBool)
+                                        }
+
+                                        // Clear timer
+                                        clearTimeout(timer.timer);
+                                        timer.timer = setTimeout(timerCallbackFx, timerWait);
+                                };
+
+                                jQuery(elem).on('keydown paste cut input', startWatch);
+                        }
+                };
+
+                // Watch Each Element
+                return this.each(function() {
+                        watchElement(this);
+                });
+
+        };
+})(jQuery);