', + + options: { + classes: {}, + disabled: false, + + // Callbacks + create: null + }, + + _createWidget: function (options, element) { + element = $(element || this.defaultElement || this)[0]; + this.element = $(element); + this.uuid = widgetUuid++; + this.eventNamespace = '.' + this.widgetName + this.uuid; + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + this.classesElementLookup = {}; + + if (element !== this) { + $.data(element, this.widgetFullName, this); + this._on(true, this.element, { + remove: function (event) { + if (event.target === element) { + this.destroy(); + } + } + }); + this.document = $( + element.style + ? // Element within the document + element.ownerDocument + : // Element is window or document + element.document || element + ); + this.window = $( + this.document[0].defaultView || this.document[0].parentWindow + ); + } + + this.options = $.widget.extend( + {}, + this.options, + this._getCreateOptions(), + options + ); + + this._create(); + + if (this.options.disabled) { + this._setOptionDisabled(this.options.disabled); + } + + this._trigger('create', null, this._getCreateEventData()); + this._init(); + }, + + _getCreateOptions: function () { + return {}; + }, + + _getCreateEventData: $.noop, + + _create: $.noop, + + _init: $.noop, + + destroy: function () { + var that = this; + + this._destroy(); + $.each(this.classesElementLookup, function (key, value) { + that._removeClass(value, key); + }); + + // We can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element.off(this.eventNamespace).removeData(this.widgetFullName); + this.widget().off(this.eventNamespace).removeAttr('aria-disabled'); + + // Clean up events and states + this.bindings.off(this.eventNamespace); + }, + + _destroy: $.noop, + + widget: function () { + return this.element; + }, + + option: function (key, value) { + var options = key; + var parts; + var curOption; + var i; + + if (arguments.length === 0) { + // Don't return a reference to the internal hash + return $.widget.extend({}, this.options); + } + + if (typeof key === 'string') { + // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split('.'); + key = parts.shift(); + if (parts.length) { + curOption = options[key] = $.widget.extend({}, this.options[key]); + for (i = 0; i < parts.length - 1; i++) { + curOption[parts[i]] = curOption[parts[i]] || {}; + curOption = curOption[parts[i]]; + } + key = parts.pop(); + if (arguments.length === 1) { + return curOption[key] === undefined ? null : curOption[key]; + } + curOption[key] = value; + } else { + if (arguments.length === 1) { + return this.options[key] === undefined ? null : this.options[key]; + } + options[key] = value; + } + } + + this._setOptions(options); + + return this; + }, + + _setOptions: function (options) { + var key; + + for (key in options) { + this._setOption(key, options[key]); + } + + return this; + }, + + _setOption: function (key, value) { + if (key === 'classes') { + this._setOptionClasses(value); + } + + this.options[key] = value; + + if (key === 'disabled') { + this._setOptionDisabled(value); + } + + return this; + }, + + _setOptionClasses: function (value) { + var classKey, elements, currentElements; + + for (classKey in value) { + currentElements = this.classesElementLookup[classKey]; + if ( + value[classKey] === this.options.classes[classKey] || + !currentElements || + !currentElements.length + ) { + continue; + } + + // We are doing this to create a new jQuery object because the _removeClass() call + // on the next line is going to destroy the reference to the current elements being + // tracked. We need to save a copy of this collection so that we can add the new classes + // below. + elements = $(currentElements.get()); + this._removeClass(currentElements, classKey); + + // We don't use _addClass() here, because that uses this.options.classes + // for generating the string of classes. We want to use the value passed in from + // _setOption(), this is the new value of the classes option which was passed to + // _setOption(). We pass this value directly to _classes(). + elements.addClass( + this._classes({ + element: elements, + keys: classKey, + classes: value, + add: true + }) + ); + } + }, + + _setOptionDisabled: function (value) { + this._toggleClass( + this.widget(), + this.widgetFullName + '-disabled', + null, + !!value + ); + + // If the widget is becoming disabled, then nothing is interactive + if (value) { + this._removeClass(this.hoverable, null, 'ui-state-hover'); + this._removeClass(this.focusable, null, 'ui-state-focus'); + } + }, + + enable: function () { + return this._setOptions({ disabled: false }); + }, + + disable: function () { + return this._setOptions({ disabled: true }); + }, + + _classes: function (options) { + var full = []; + var that = this; + + options = $.extend( + { + element: this.element, + classes: this.options.classes || {} + }, + options + ); + + function bindRemoveEvent() { + options.element.each(function (_, element) { + var isTracked = $.map(that.classesElementLookup, function (elements) { + return elements; + }).some(function (elements) { + return elements.is(element); + }); + + if (!isTracked) { + that._on($(element), { + remove: '_untrackClassesElement' + }); + } + }); + } + + function processClassString(classes, checkOption) { + var current, i; + for (i = 0; i < classes.length; i++) { + current = that.classesElementLookup[classes[i]] || $(); + if (options.add) { + bindRemoveEvent(); + current = $( + $.uniqueSort(current.get().concat(options.element.get())) + ); + } else { + current = $(current.not(options.element).get()); + } + that.classesElementLookup[classes[i]] = current; + full.push(classes[i]); + if (checkOption && options.classes[classes[i]]) { + full.push(options.classes[classes[i]]); + } + } + } + + if (options.keys) { + processClassString(options.keys.match(/\S+/g) || [], true); + } + if (options.extra) { + processClassString(options.extra.match(/\S+/g) || []); + } + + return full.join(' '); + }, + + _untrackClassesElement: function (event) { + var that = this; + $.each(that.classesElementLookup, function (key, value) { + if ($.inArray(event.target, value) !== -1) { + that.classesElementLookup[key] = $(value.not(event.target).get()); + } + }); + + this._off($(event.target)); + }, + + _removeClass: function (element, keys, extra) { + return this._toggleClass(element, keys, extra, false); + }, + + _addClass: function (element, keys, extra) { + return this._toggleClass(element, keys, extra, true); + }, + + _toggleClass: function (element, keys, extra, add) { + add = typeof add === 'boolean' ? add : extra; + var shift = typeof element === 'string' || element === null, + options = { + extra: shift ? keys : extra, + keys: shift ? element : keys, + element: shift ? this.element : element, + add: add + }; + options.element.toggleClass(this._classes(options), add); + return this; + }, + + _on: function (suppressDisabledCheck, element, handlers) { + var delegateElement; + var instance = this; + + // No suppressDisabledCheck flag, shuffle arguments + if (typeof suppressDisabledCheck !== 'boolean') { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // No element argument, shuffle and use this.element + if (!handlers) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + element = delegateElement = $(element); + this.bindings = this.bindings.add(element); + } + + $.each(handlers, function (event, handler) { + function handlerProxy() { + // Allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( + !suppressDisabledCheck && + (instance.options.disabled === true || + $(this).hasClass('ui-state-disabled')) + ) { + return; + } + return ( + typeof handler === 'string' ? instance[handler] : handler + ).apply(instance, arguments); + } + + // Copy the guid so direct unbinding works + if (typeof handler !== 'string') { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match(/^([\w:-]*)\s*(.*)$/); + var eventName = match[1] + instance.eventNamespace; + var selector = match[2]; + + if (selector) { + delegateElement.on(eventName, selector, handlerProxy); + } else { + element.on(eventName, handlerProxy); + } + }); + }, + + _off: function (element, eventName) { + eventName = + (eventName || '').split(' ').join(this.eventNamespace + ' ') + + this.eventNamespace; + element.off(eventName); + + // Clear the stack to avoid memory leaks (#10056) + this.bindings = $(this.bindings.not(element).get()); + this.focusable = $(this.focusable.not(element).get()); + this.hoverable = $(this.hoverable.not(element).get()); + }, + + _delay: function (handler, delay) { + var instance = this; + function handlerProxy() { + return ( + typeof handler === 'string' ? instance[handler] : handler + ).apply(instance, arguments); + } + return setTimeout(handlerProxy, delay || 0); + }, + + _hoverable: function (element) { + this.hoverable = this.hoverable.add(element); + this._on(element, { + mouseenter: function (event) { + this._addClass($(event.currentTarget), null, 'ui-state-hover'); + }, + mouseleave: function (event) { + this._removeClass($(event.currentTarget), null, 'ui-state-hover'); + } + }); + }, + + _focusable: function (element) { + this.focusable = this.focusable.add(element); + this._on(element, { + focusin: function (event) { + this._addClass($(event.currentTarget), null, 'ui-state-focus'); + }, + focusout: function (event) { + this._removeClass($(event.currentTarget), null, 'ui-state-focus'); + } + }); + }, + + _trigger: function (type, event, data) { + var prop, orig; + var callback = this.options[type]; + + data = data || {}; + event = $.Event(event); + event.type = ( + type === this.widgetEventPrefix ? type : this.widgetEventPrefix + type + ).toLowerCase(); + + // The original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[0]; + + // Copy original event properties over to the new event + orig = event.originalEvent; + if (orig) { + for (prop in orig) { + if (!(prop in event)) { + event[prop] = orig[prop]; + } + } + } + + this.element.trigger(event, data); + return !( + ($.isFunction(callback) && + callback.apply(this.element[0], [event].concat(data)) === false) || + event.isDefaultPrevented() + ); + } + }; + + $.each({ show: 'fadeIn', hide: 'fadeOut' }, function (method, defaultEffect) { + $.Widget.prototype['_' + method] = function (element, options, callback) { + if (typeof options === 'string') { + options = { effect: options }; + } + + var hasOptions; + var effectName = !options + ? method + : options === true || typeof options === 'number' + ? defaultEffect + : options.effect || defaultEffect; + + options = options || {}; + if (typeof options === 'number') { + options = { duration: options }; + } + + hasOptions = !$.isEmptyObject(options); + options.complete = callback; + + if (options.delay) { + element.delay(options.delay); + } + + if (hasOptions && $.effects && $.effects.effect[effectName]) { + element[method](options); + } else if (effectName !== method && element[effectName]) { + element[effectName](options.duration, options.easing, callback); + } else { + element.queue(function (next) { + $(this)[method](); + if (callback) { + callback.call(element[0]); + } + next(); + }); + } + }; + }); }); - -var widget = $.widget; - - - -})); diff --git a/app/assets/stylesheets/jquery.fileupload-noscript.scss b/app/assets/stylesheets/jquery.fileupload-noscript.css similarity index 79% rename from app/assets/stylesheets/jquery.fileupload-noscript.scss rename to app/assets/stylesheets/jquery.fileupload-noscript.css index d0dda3a..e9e02dc 100644 --- a/app/assets/stylesheets/jquery.fileupload-noscript.scss +++ b/app/assets/stylesheets/jquery.fileupload-noscript.css @@ -2,19 +2,19 @@ /* * jQuery File Upload Plugin NoScript CSS * https://github.com/blueimp/jQuery-File-Upload - * + * Version: 10.32.0 * Copyright 2013, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * https://opensource.org/licenses/MIT */ .fileinput-button input { position: static; opacity: 1; filter: none; - font-size: inherit; + font-size: inherit !important; direction: inherit; } .fileinput-button span { diff --git a/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss b/app/assets/stylesheets/jquery.fileupload-ui-noscript.css similarity index 84% rename from app/assets/stylesheets/jquery.fileupload-ui-noscript.scss rename to app/assets/stylesheets/jquery.fileupload-ui-noscript.css index 6ad2ad6..889919e 100644 --- a/app/assets/stylesheets/jquery.fileupload-ui-noscript.scss +++ b/app/assets/stylesheets/jquery.fileupload-ui-noscript.css @@ -2,12 +2,12 @@ /* * jQuery File Upload UI Plugin NoScript CSS * https://github.com/blueimp/jQuery-File-Upload - * + * Version: 10.32.0 * Copyright 2012, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * https://opensource.org/licenses/MIT */ .fileinput-button i, diff --git a/app/assets/stylesheets/jquery.fileupload-ui.scss b/app/assets/stylesheets/jquery.fileupload-ui.css similarity index 58% rename from app/assets/stylesheets/jquery.fileupload-ui.scss rename to app/assets/stylesheets/jquery.fileupload-ui.css index b349a0f..cb77268 100644 --- a/app/assets/stylesheets/jquery.fileupload-ui.scss +++ b/app/assets/stylesheets/jquery.fileupload-ui.css @@ -2,21 +2,17 @@ /* * jQuery File Upload UI Plugin CSS * https://github.com/blueimp/jQuery-File-Upload - * + * Version: 10.32.0 * Copyright 2010, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * https://opensource.org/licenses/MIT */ -.fileupload-buttonbar .btn, -.fileupload-buttonbar .toggle { - margin-bottom: 5px; -} .progress-animated .progress-bar, .progress-animated .bar { - background: image-url("progressbar.gif") !important; + background: url('../img/progressbar.gif') !important; filter: none; } .fileupload-process { @@ -28,30 +24,45 @@ display: block; width: 32px; height: 32px; - background: image-url("loading.gif") center no-repeat; + background: url('../img/loading.gif') center no-repeat; background-size: contain; } .files audio, .files video { max-width: 300px; } +.files .name { + word-wrap: break-word; + overflow-wrap: anywhere; + -webkit-hyphens: auto; + hyphens: auto; +} +.files button { + margin-bottom: 5px; +} +.toggle[type='checkbox'] { + transform: scale(2); + margin-left: 10px; +} @media (max-width: 767px) { + .fileupload-buttonbar .btn { + margin-bottom: 5px; + } + .fileupload-buttonbar .delete, .fileupload-buttonbar .toggle, .files .toggle, .files .btn span { display: none; } - .files .name { - width: 80px; - word-wrap: break-word; - } .files audio, .files video { max-width: 80px; } - .files img, - .files canvas { - max-width: 100%; +} + +@media (max-width: 480px) { + .files .image td:nth-child(2) { + display: none; } } diff --git a/app/assets/stylesheets/jquery.fileupload.scss b/app/assets/stylesheets/jquery.fileupload.css similarity index 78% rename from app/assets/stylesheets/jquery.fileupload.scss rename to app/assets/stylesheets/jquery.fileupload.css index f714c4d..7dc94cb 100644 --- a/app/assets/stylesheets/jquery.fileupload.scss +++ b/app/assets/stylesheets/jquery.fileupload.css @@ -2,12 +2,12 @@ /* * jQuery File Upload Plugin CSS * https://github.com/blueimp/jQuery-File-Upload - * + * Version: 10.32.0 * Copyright 2013, Sebastian Tschan * https://blueimp.net * * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * https://opensource.org/licenses/MIT */ .fileinput-button { @@ -20,8 +20,9 @@ top: 0; right: 0; margin: 0; + height: 100%; opacity: 0; - -ms-filter: 'alpha(opacity=0)'; + filter: alpha(opacity=0); font-size: 200px !important; direction: ltr; cursor: pointer; @@ -30,8 +31,6 @@ /* Fixes for IE < 8 */ @media screen\9 { .fileinput-button input { - filter: alpha(opacity=0); - font-size: 100%; - height: 100%; + font-size: 150% !important; } } diff --git a/lib/jquery/fileupload/rails/version.rb b/lib/jquery/fileupload/rails/version.rb index 83e8d80..0478b2e 100644 --- a/lib/jquery/fileupload/rails/version.rb +++ b/lib/jquery/fileupload/rails/version.rb @@ -1,7 +1,7 @@ module JQuery module FileUpload module Rails - VERSION = "1.0.0" + VERSION = "1.1.0" end end end