Nettoyage de code pour suivre les dernières métriques ABC

Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gem 'simple_calendar'
 
 gem 'rails'
+gem 'has_scope'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0.0.beta1'

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: c26ae0b1393311180b5137c6b4a271de3385d069
+  revision: 809142efe855e590331cdc41e72dcad76b719a46
   specs:
     activeadmin (1.0.0.pre)
       arbre (~> 1.0, >= 1.0.2)
@@ -150,7 +150,7 @@ GEM
       actionpack (>= 3.2.13)
     formtastic_i18n (0.1.1)
     geocoder (1.2.5)
-    guard (2.7.1)
+    guard (2.8.0)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -169,7 +169,7 @@ GEM
     guard-minitest (2.3.2)
       guard (~> 2.0)
       minitest (>= 3.0)
-    guard-rubocop (1.1.0)
+    guard-rubocop (1.2.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
     haml (4.0.5)
@@ -219,7 +219,7 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -234,7 +234,7 @@ GEM
     mysql2 (0.3.16)
     naught (1.0.0)
     orm_adapter (0.5.0)
-    parser (2.2.0.pre.6)
+    parser (2.2.0.pre.7)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     polyamorous (1.1.0)
@@ -290,7 +290,7 @@ GEM
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.6.1)
+    ruby-progressbar (1.7.0)
     ruby2ruby (2.1.3)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
@@ -341,7 +341,7 @@ GEM
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
-    tinymce-rails (4.1.5)
+    tinymce-rails (4.1.6)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
@@ -393,6 +393,7 @@ DEPENDENCIES
   guard-minitest
   guard-rubocop
   haml-rails
+  has_scope
   http_accept_language
   i18n-active_record!
   jbuilder (~> 2.0)

Guardfile

@@ -29,7 +29,7 @@ end
 
 notification :notifysend
 
-guard 'brakeman', run_on_start: true, quiet: true, min_confidence: 10 do
+guard :brakeman, run_on_start: true, quiet: true, min_confidence: 10 do
   watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
   watch(%r{^config/.+\.rb$})
   watch(%r{^lib/.+\.rb$})

app/controllers/application_controller.rb

@@ -11,4 +11,11 @@ class ApplicationController < ActionController::Base
     I18n.locale = http_accept_language
       .compatible_language_from I18n.available_locales
   end
+
+  protected
+
+  # Useful to manage absolute url in mails
+  def set_mailer_host
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port
+  end
 end

app/controllers/events_controller.rb

@@ -1,33 +1,33 @@
 # Event life cycle
 # This is a central part to this project
 class EventsController < ApplicationController
+  has_scope :region, :locality, :tag, :daylimit
+
   before_action :set_events, only: [:index]
-  before_action :set_event, only:
+  before_action :set_event, except: [:index, :new, :preview_create, :create]
-    [:show, :edit, :preview, :update, :cancel, :destroy]
+  before_action :set_create_event, only: [:preview_create, :create]
-  before_action :check_secret, only:
+  before_action :check_secret, only: [:edit, :preview, :update, :destroy]
-    [:edit, :preview, :update, :cancel, :destroy]
+  before_action :set_old_event, only: [:update]
   before_action :set_mailer_host
   rescue_from ActiveRecord::StaleObjectError, with: :locked
 
   def index
     respond_to do |format|
       format.html { render layout: 'iframe' if params[:iframe] }
-      format.rss { @events = @events.future.in params[:daylimit] }
+      format.rss { @events = @events.future }
-      format.ics { @events = @events.last_year.order :id }
+      format.ics { @events = @events.last_year }
-      format.xml { @events = @events.includes(:related_region).order :id }
+      format.xml { @events = @events.includes :related_region }
     end
   end
 
   # GET /users/new
   def new
-    @event = Event.new
+    @event = Event.new start_time: Time.now.change(min: 0) + 1.day + 1.hour,
-    @event.start_time ||= Time.now.change(min: 0) + 1.day + 1.hour
+                       end_time: Time.now.change(min: 0) + 1.day + 2.hour
-    @event.end_time ||= Time.now.change(min: 0) + 1.day + 2.hour
   end
 
   # POST /events/preview
   def preview_create
-    @event = Event.new event_params
     @event.valid?
     render action: :new
   end
@@ -35,8 +35,6 @@ class EventsController < ApplicationController
   # POST /events
   # POST /events.json
   def create
-    @event = Event.new event_params
-
     respond_to do |format|
       if @event.save && send_creation_mails
         format.html { redirect_to :root, notice: t('.ok') }
@@ -60,7 +58,6 @@ class EventsController < ApplicationController
   # PATCH/PUT /events/1
   # PATCH/PUT /events/1.json
   def update
-    @older_event = Event.new @event.attributes
     respond_to do |format|
       if @event.update(event_params) && send_update_mails
         format.html { redirect_to :root, notice: t('.ok') }
@@ -78,7 +75,7 @@ class EventsController < ApplicationController
   def destroy
     @event.destroy
     respond_to do |format|
-      format.html { redirect_to events_url, notice: t('.ok') }
+      format.html { redirect_to :root, notice: t('.ok') }
       format.json { head :no_content }
     end
   end
@@ -86,10 +83,7 @@ class EventsController < ApplicationController
   private
 
   def set_events
-    @events = Event.moderated
+    @events = apply_scopes Event.moderated
-    @events = @events.region params[:region] if params[:region]
-    @events = @events.locality params[:locality] if params[:locality]
-    @events = @events.tag params[:tag] if params[:tag]
   end
 
   # Use callbacks to share common setup or constraints between actions
@@ -102,6 +96,14 @@ class EventsController < ApplicationController
     @event = @event.find params[:id]
   end
 
+  def set_create_event
+    @event = Event.new event_params
+  end
+
+  def set_old_event
+    @older_event = Event.new @event.attributes
+  end
+
   # Never trust parameters from the scary internet, only allow the white list
   # through
   def event_params
@@ -117,11 +119,6 @@ class EventsController < ApplicationController
       unless params[:secret] == @event.secret
   end
 
-  # Useful to manage absolute url in mails
-  def set_mailer_host
-    ActionMailer::Base.default_url_options[:host] = request.host_with_port
-  end
-
   def send_creation_mails
     # Send an event creation mail to its author
     EventMailer.create(@event).deliver

app/controllers/maps_controller.rb

@@ -2,16 +2,12 @@
 #
 # Access to OSM controls
 class MapsController < ApplicationController
+  has_scope :region, :locality, :tag
+
   def index
     respond_to do |format|
       format.html
-      format.json do
+      format.json { render json: apply_scopes(Event.moderated.future.geo) }
-        @events = Event.moderated.future.geo
-        @events = @events.region params[:region] if params[:region]
-        @events = @events.locality params[:locality] if params[:locality]
-        @events = @events.tag params[:tag] if params[:tag]
-        render json: @events
-      end
     end
   end
 end

app/controllers/moderations_controller.rb

@@ -3,6 +3,7 @@ class ModerationsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_moderation, :set_mailer_host, only:
     [:show, :edit, :preview, :update, :validate, :accept, :refuse, :destroy]
+  before_action :set_old_mod, only: [:update]
   rescue_from ActiveRecord::StaleObjectError, with: :locked
 
   def index
@@ -18,10 +19,9 @@ class ModerationsController < ApplicationController
   # PATCH/PUT /moderations/1
   # PATCH/PUT /moderations/1.json
   def update
-    @older_mod = Event.new @event.attributes
     respond_to do |format|
       if @moderation.update_attributes(moderation_params) && send_mails
-        format.html { redirect_to moderations_url, notice: t('.ok') }
+        format.html { redirect_to :moderations, notice: t('.ok') }
         format.json { head :no_content }
       else
         format.html { render action: 'edit' }
@@ -34,28 +34,20 @@ class ModerationsController < ApplicationController
   # PATCH/PUT /accept/1
   # PATCH/PUT /accept/1.json
   def accept
+    @moderation.update moderated: true
+    send_accept_mails
     respond_to do |format|
-      if @moderation.update(moderated: true) && send_accept_mails
+      format.html { redirect_to :moderations, notice: t('.ok') }
-        tweet
-        format.html { redirect_to moderations_url, notice: t('.ok') }
       format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        # 422 means :unprocessable_entity
-        format.json { render json: @moderation.errors, status: 422 }
-      end
     end
   end
 
   # DELETE /events/1
   # DELETE /events/1.json
   def destroy
-    if @moderation.destroy && send_destroy_mails
+    send_destroy_mails if @moderation.destroy
-      EventMailer.destroy(@moderation, current_user, @reason).deliver
-      ModerationMailer.destroy(@moderation, current_user, @reason).deliver
-    end
     respond_to do |format|
-      format.html { redirect_to moderations_url, notice: t('.ok') }
+      format.html { redirect_to :moderations, notice: t('.ok') }
       format.json { head :no_content }
     end
   end
@@ -68,6 +60,10 @@ class ModerationsController < ApplicationController
     @moderation = @event
   end
 
+  def set_old_mod
+    @older_mod = Event.new @event.attributes
+  end
+
   # Never trust parameters from the scary internet, only allow the white list
   # through.
   def moderation_params
@@ -88,6 +84,8 @@ class ModerationsController < ApplicationController
   end
 
   def send_accept_mails
+    tweet
+
     # Send an acceptation mail to its author
     EventMailer.accept(@moderation, current_user).deliver
 
@@ -113,6 +111,9 @@ class ModerationsController < ApplicationController
     else
       @reason = t "moderations.refuse.reason_#{params[:reason]}_long"
     end
+
+    EventMailer.destroy(@moderation, current_user, @reason).deliver
+    ModerationMailer.destroy(@moderation, current_user, @reason).deliver
   end
 
   def locked

app/controllers/notes_controller.rb

@@ -1,6 +1,7 @@
 # Events, particulary during moderation, can have notes associated to them
 class NotesController < ApplicationController
-  before_action :set_event, :set_mailer_host, only: [:new, :create]
+  before_action :set_event, only: [:new, :create]
+  before_action :create_note, :set_mailer_host, only: [:create]
 
   # GET /moderations/id/new
   def new
@@ -8,14 +9,12 @@ class NotesController < ApplicationController
   end
 
   def create
-    @note = @moderation.notes.new note_params.merge author: current_user
-
     respond_to do |format|
       if @note.save && send_mails
         format.html { redirect_to moderations_url, notice: t('.ok') }
         format.json { render action: :show, status: :created, location: @event }
       else
-        format.html { render action: 'new' }
+        format.html { render action: :new }
         format.json { render json: @note.errors, status: :unprocessable_entity }
       end
     end
@@ -29,6 +28,10 @@ class NotesController < ApplicationController
     @moderation = @event
   end
 
+  def create_note
+    @note = @moderation.notes.new note_params.merge author: current_user
+  end
+
   # Never trust parameters from the scary internet, only allow the white list
   # through.
   def note_params

app/controllers/regions_controller.rb

@@ -1,32 +1,3 @@
 # Manage regions, mostly get stats out of them
 class RegionsController < InheritedResources::Base
-  def stats
-    @region_events = Event.joins(:related_region).group(:name)
-      .order('count(name) desc').count :name
-
-    @city_events = Event.group(:city).having('count(city) > 3')
-      .order('count(city) desc').count :city
-
-    @year_events = Event.group(year_grouping).count
-
-    @month_events = Event.group(year_grouping, month_grouping).count
-  end
-
-  private
-
-  def year_grouping
-    if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name
-      'extract(year from start_time)'
-    elsif Event.connection.adapter_name == 'SQLite'
-      'strftime("%Y", start_time)'
-    end
-  end
-
-  def month_grouping
-    if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name
-      'extract(month from start_time)'
-    elsif Event.connection.adapter_name == 'SQLite'
-      'strftime("%m", start_time)'
-    end
-  end
 end

app/controllers/stats_controller.rb

@@ -0,0 +1,34 @@
+# Generate statistics, around events, by date or place
+class StatsController < ApplicationController
+  before_action :set_temporal, :set_local, only: [:index]
+
+  private
+
+  def set_temporal
+    @year_events = Event.group(year_grouping).count
+    @month_events = Event.group(year_grouping, month_grouping).count
+  end
+
+  def set_local
+    @region_events = Event.joins(:related_region).group(:name)
+                     .order('count(name) desc').count
+    @city_events = Event.group(:city).having('count(city) > 3')
+                   .order('count(city) desc').count
+  end
+
+  def year_grouping
+    if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name
+      'extract(year from start_time)'
+    elsif Event.connection.adapter_name == 'SQLite'
+      'strftime("%Y", start_time)'
+    end
+  end
+
+  def month_grouping
+    if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name
+      'extract(month from start_time)'
+    elsif Event.connection.adapter_name == 'SQLite'
+      'strftime("%m", start_time)'
+    end
+  end
+end

app/controllers/tags_controller.rb

@@ -10,7 +10,7 @@ class TagsController < InheritedResources::Base
 
     respond_to do |format|
       format.html
-      format.json { render json: @tags.to_json }
+      format.json { render json: @tags }
     end
   end
 

app/helpers/events_helper.rb

@@ -26,16 +26,24 @@ module EventsHelper
 
   def display_date(event = @event)
     if event.start_time.to_date == event.end_time.to_date
+      display_sameday event
+    else
+      display_multi_days event
+    end
+  end
+
+  def display_sameday(event)
     t 'date.formats.same_day',
       date: l(event.start_time.to_date, format: :long),
       start: l(event.start_time, format: :hours),
       end: l(event.end_time, format: :hours)
-    else
+  end
+
+  def display_multi_days(event)
     t 'date.formats.period',
       start: l(event.start_time, format: :at),
       end: l(event.end_time, format: :at)
   end
-  end
 
   def wrap(s, width = 78)
     s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")

app/models/event.rb

@@ -29,7 +29,7 @@ class Event < ActiveRecord::Base
   scope :last_year, -> { where '? <= end_time', 1.year.ago }
   scope :past, -> { where 'start_time <= ?', DateTime.now }
   scope :future, -> { where '? <= end_time', DateTime.now }
-  scope :in, -> days { where 'end_time <= ?', (days || 30).to_i.days.from_now }
+  scope :daylimit, -> d { where 'end_time <= ?', (d || 30).to_i.days.from_now }
   scope :year, (lambda do |year|
     where '? <= end_time and start_time <= ?',
           Date.new(year, 1, 1).beginning_of_week,

app/views/layouts/application.html.haml

@@ -57,7 +57,7 @@
         = link_to application_infos_path do
           %em.fa.fa-info
           =t '.infos'
-        = link_to stats_regions_path do
+        = link_to stats_path do
           %em.fa.fa-signal
           =t '.stats'
         = link_to application_contact_path do

config/locales/views/en.yml

@@ -139,6 +139,7 @@ it more readable or agreable.
         \n* You can modify the 30 days limit with the parameter `daylimit`.  \n
         Example: `%{daylimit}`"
   stats:
+    index:
       title: Statistics
       all: Validated events
       allModeration: Events waiting for validation

config/locales/views/fr.yml

@@ -137,6 +137,7 @@ fr:
         utilisant le paramètre `daylimit`.  \n
         Exemple: `%{daylimit}`"
   stats:
+    index:
       title: Statistiques
       all: Événements validés
       allModeration: Événements en cours de modération

config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   get 'application/infos'
   get 'application/contact'
   get 'application/rules'
+  get 'stats', to: 'stats#index'
 
   resources :users
   resources :events do
@@ -15,9 +16,7 @@ Rails.application.routes.draw do
     get :validate, :refuse, on: :member
     put :accept, on: :member
   end
-  resources :regions, only: [:index] do
+  resources :regions, only: [:index]
-    get 'stats', on: :collection
-  end
   resources :tags, only: [:index, :show]
   resources :maps, only: [:index]
   resources :lugs, only: [:index, :show]

public/webshims/polyfiller.js

@@ -119,6 +119,7 @@
 		promise: 'es6',
 		URL: 'url'
 	};
+	var supportCapture = 'capture' in create('input');
 
 	clearInterval(webshims.timer);
 	support.advancedObjectProperties = support.objectAccessor = support.ES5 = !!('create' in Object && 'seal' in Object);
@@ -136,7 +137,7 @@
 	}
 
 	$.extend(webshims, {
-		version: '1.15.3',
+		version: '1.15.4',
 
 		cfg: {
 			enhanceAuto: window.Audio && (!window.matchMedia || matchMedia('(min-device-width: 721px)').matches),
@@ -212,11 +213,13 @@
 		})(),
 		_polyfill: function(features){
 			var toLoadFeatures = [];
-			var hasFormsExt;
+			var hasFormsExt, needExtStyles;
 
 			if(!firstRun.run){
 				hasFormsExt = $.inArray('forms-ext', features) !== -1;
 				firstRun();
+				needExtStyles = (hasFormsExt && !modules["form-number-date-ui"].test()) || (!supportCapture && $.inArray('mediacapture', features) !== -1);
+
 				if(hasFormsExt && $.inArray('forms', features) == -1){
 					features.push('forms');
 					if(WSDEBUG){
@@ -224,7 +227,7 @@
 					}
 				}
 				if(webCFG.loadStyles){
-					loader.loadCSS('styles/shim'+((hasFormsExt && !modules["form-number-date-ui"].test()) ? '-ext' : '')+'.css');
+					loader.loadCSS('styles/shim'+(needExtStyles ? '-ext' : '')+'.css');
 				}
 			}
 
@@ -922,7 +925,7 @@
 	//<picture
 	create('picture');
 	addPolyfill('picture', {
-		test: ('picturefill' in window) || !!window.HTMLPictureElement,
+		test: ('picturefill' in window) || !!window.HTMLPictureElement || ('respimage' in window),
 		d: ['matchMedia'],
 		c: [18],
 		loadInit: function(){
@@ -964,22 +967,6 @@
 	});
 	//>
 
-	//<usermedia
-	var userMediaTest =  ('getUserMedia' in navigator);
-
-	addPolyfill('usermedia-core', {
-		f: 'usermedia',
-		test: userMediaTest && window.URL,
-		d: ['url', DOMSUPPORT]
-	});
-
-	addPolyfill('usermedia-shim', {
-		f: 'usermedia',
-		test: !!(userMediaTest || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia),
-		d: ['url', 'mediaelement', DOMSUPPORT]
-	});
-	//>
-
 	//<canvas
 	(function(){
 		addPolyfill('canvas', {
@@ -1001,6 +988,30 @@
 	//>
 
 
+	//<usermedia
+	var userMediaTest =  ('getUserMedia' in navigator);
+
+	addPolyfill('usermedia-core', {
+		f: 'usermedia',
+		test: userMediaTest && window.URL,
+		d: ['url', DOMSUPPORT]
+	});
+
+	addPolyfill('usermedia-shim', {
+		f: 'usermedia',
+		test: !!(userMediaTest || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia),
+		d: ['url', 'mediaelement', DOMSUPPORT]
+	});
+	//>
+
+	//<mediacapture
+	addPolyfill('mediacapture', {
+		test: supportCapture,
+		d: ['swfmini', 'usermedia', DOMSUPPORT, 'filereader', 'forms', 'canvas']
+	});
+	//>
+
+
 	//<forms
 	(function(){
 		var formExtend, formOptions;
@@ -1086,7 +1097,7 @@
 
 		webshims.validationMessages = webshims.validityMessages = {
 			langSrc: 'i18n/formcfg-',
-			availableLangs: "ar cs el es fa fr he hi hu it ja lt nl pl pt pt-BR pt-PT ru sv zh-CN zh-TW".split(' ')
+			availableLangs: "ar ca cs el es fa fr he hi hu it ja lt nl pl pt pt-BR pt-PT ru sv zh-CN zh-TW".split(' ')
 		};
 		webshims.formcfg = $.extend({}, webshims.validationMessages);
 
@@ -1244,15 +1255,6 @@
 	});
 	//>
 
-	/*
-	//<mediacapture
-	addPolyfill('mediacapture', {
-		test: 'capture' in create('input'),
-		d: ['swfmini', 'usermedia', DOMSUPPORT, 'filereader', 'forms', 'canvas']
-	});
-	//>
-	*/
-
 	//<details
 	addPolyfill('details', {
 		test: ('open' in create('details')),

public/webshims/shims/canvas-blob.js

@@ -85,13 +85,7 @@
 			};
 		}
 	}
-	if (typeof define === 'function' && define.amd) {
-		define(function () {
-			return dataURLtoBlob;
-		});
-	} else {
 	window.dataURLtoBlob = dataURLtoBlob;
-	}
 }(this));
 
 webshim.isReady('canvas-blob', true);

public/webshims/shims/combos/1.js

@@ -480,6 +480,8 @@ webshims.isReady('swfmini', true);
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/10.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -2275,9 +2280,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -2432,6 +2441,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -2453,8 +2463,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -2756,9 +2765,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2882,7 +2893,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -2911,7 +2921,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/combos/11.js

@@ -1044,9 +1044,13 @@
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -1201,6 +1205,7 @@
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -1222,8 +1227,7 @@
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -1525,9 +1529,11 @@
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -1651,7 +1657,6 @@
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -1680,7 +1685,6 @@
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/combos/12.js

@@ -893,10 +893,11 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -937,6 +938,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -949,6 +951,16 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/combos/13.js

@@ -670,10 +670,11 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -714,6 +715,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -726,6 +728,16 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/combos/15.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1488,6 +1493,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];
@@ -2149,21 +2156,24 @@ if(webshims.support.inputtypes.date && /webkit/i.test(navigator.userAgent)){
 
 webshims.addReady(function(context, contextElem){
 	//start constrain-validation
-	var focusElem;
+
 	$('form', context)
 		.add(contextElem.filter('form'))
 		.on('invalid', $.noop)
 	;
 
+	setTimeout(function(){
+		var focusElem;
 		try {
-		if(context == document && !('form' in (document.activeElement || {}))) {
+			if(!('form' in (document.activeElement || {}))) {
 				focusElem = $(context.querySelector('input[autofocus], select[autofocus], textarea[autofocus]')).eq(0).getShadowFocusElement()[0];
-			if (focusElem && focusElem.offsetHeight && focusElem.offsetWidth) {
+				if (focusElem && (focusElem.offsetHeight || focusElem.offsetWidth)) {
 					focusElem.focus();
 				}
 			}
 		}
 		catch (er) {}
+	}, 9);
 
 });
 

public/webshims/shims/combos/16.js

@@ -325,20 +325,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -759,7 +764,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1711,6 +1716,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];
@@ -2372,21 +2379,24 @@ if(webshims.support.inputtypes.date && /webkit/i.test(navigator.userAgent)){
 
 webshims.addReady(function(context, contextElem){
 	//start constrain-validation
-	var focusElem;
+
 	$('form', context)
 		.add(contextElem.filter('form'))
 		.on('invalid', $.noop)
 	;
 
+	setTimeout(function(){
+		var focusElem;
 		try {
-		if(context == document && !('form' in (document.activeElement || {}))) {
+			if(!('form' in (document.activeElement || {}))) {
 				focusElem = $(context.querySelector('input[autofocus], select[autofocus], textarea[autofocus]')).eq(0).getShadowFocusElement()[0];
-			if (focusElem && focusElem.offsetHeight && focusElem.offsetWidth) {
+				if (focusElem && (focusElem.offsetHeight || focusElem.offsetWidth)) {
 					focusElem.focus();
 				}
 			}
 		}
 		catch (er) {}
+	}, 9);
 
 });
 

public/webshims/shims/combos/17.js

@@ -1660,9 +1660,13 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -1817,6 +1821,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -1838,8 +1843,7 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -2141,9 +2145,11 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2267,7 +2273,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -2296,7 +2301,6 @@ webshims.register('form-number-date-api', function($, webshims, window, document
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/combos/18.js

@@ -1,568 +1,429 @@
-webshim.ready('matchMedia', function($, webshim, w, doc, undefined){
+/*! respimage - v0.9.5 - 2014-10-22
-	try {
+ Licensed MIT */
-		new Image();
+!function(window, document, undefined) {
-	} catch(e){
-		window.Image = function(){
-			return document.createElement('img');
-		};
-	}
-	webshim.isReady('picture', true);
-// Enable strict mode
 	"use strict";
-
+	function trim(str) {
-	// If picture is supported, well, that's awesome. Let's get outta here...
-	if ( w.HTMLPictureElement ) {
-		w.picturefill = function() { };
-		return;
-	}
-
-	// HTML shim|v it for old IE (IE9 will still need the HTML video tag workaround)
-	doc.createElement( "picture" );
-
-	// local object for method references and testing exposure
-	var pf = {};
-
-	// namespace
-	pf.ns = "picturefill";
-
-	// srcset support test
-	pf.srcsetSupported = "srcset" in doc.createElement( "img" );
-	pf.sizesSupported = w.HTMLImageElement.sizes;
-
-	// just a string trim workaround
-	pf.trim = function( str ) {
 		return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, "");
-	};
-
-	// just a string endsWith workaround
-	pf.endsWith = function( str, suffix ) {
-		return str.endsWith ? str.endsWith( suffix ) : str.indexOf( suffix, str.length - suffix.length ) !== -1;
-	};
-
-	/**
-	 * Shortcut method for matchMedia ( for easy overriding in tests )
-	 */
-	pf.matchesMedia = function( media ) {
-		return w.matchMedia && w.matchMedia( media ).matches;
-	};
-
-	/**
-	 * Shortcut method for `devicePixelRatio` ( for easy overriding in tests )
-	 */
-	pf.getDpr = function() {
-		return ( w.devicePixelRatio || 1 );
-	};
-
-	/**
-	 * Get width in css pixel value from a "length" value
-	 * http://dev.w3.org/csswg/css-values-3/#length-value
-	 */
-	pf.getWidthFromLength = function( length ) {
-		// If no length was specified, or it is 0 or negative, default to `100vw` (per the spec).
-		length = length && ( parseFloat( length ) > 0 || length.indexOf( "calc(" ) > -1 ) ? length : "100vw";
-
-		/**
-		 * If length is specified in  `vw` units, use `%` instead since the div we’re measuring
-		 * is injected at the top of the document.
-		 *
-		 * TODO: maybe we should put this behind a feature test for `vw`?
-		 */
-		length = length.replace( "vw", "%" );
-
-		// Create a cached element for getting length value widths
-		if ( !pf.lengthEl ) {
-			pf.lengthEl = doc.createElement( "div" );
-			doc.documentElement.insertBefore( pf.lengthEl, doc.documentElement.firstChild );
 	}
-
+	function updateView() {
-		// Positioning styles help prevent padding/margin/width on `html` from throwing calculations off.
+		isVwDirty = !1, ri.vW = window.innerWidth || Math.max(docElem.offsetWidth || 0, docElem.clientWidth || 0),
-		pf.lengthEl.style.cssText = "position: absolute; left: 0; width: " + length + ";";
+			vH = window.innerHeight || Math.max(docElem.offsetHeight || 0, docElem.clientHeight || 0);
-
-		if ( pf.lengthEl.offsetWidth <= 0 ) {
-			// Something has gone wrong. `calc()` is in use and unsupported, most likely. Default to `100vw` (`100%`, for broader support.):
-			pf.lengthEl.style.cssText = "width: 100%;";
 	}
-
+	function parseDescriptor(descriptor) {
-		return pf.lengthEl.offsetWidth;
+		if (!(descriptor in memDescriptor)) {
-	};
+			var descriptorObj = {
-
+				val: 1,
-	// container of supported mime types that one might need to qualify before using
+				type: "x"
-	pf.types =  {};
+			}, parsedDescriptor = trim(descriptor || "");
-
+			parsedDescriptor && (parsedDescriptor.match(regDescriptor) ? (descriptorObj.val = 1 * RegExp.$1,
-	// Add support for standard mime types.
+				descriptorObj.type = RegExp.$2) : descriptorObj = !1), memDescriptor[descriptor] = descriptorObj;
-	pf.types["image/jpeg"] = true;
-	pf.types["image/gif"] = true;
-	pf.types["image/png"] = true;
-
-	// test svg support
-	pf.types[ "image/svg+xml" ] = doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image", "1.1");
-
-	// test webp support, only when the markup calls for it
-	pf.types[ "image/webp" ] = function() {
-		// based on Modernizr's lossless img-webp test
-		// note: asynchronous
-		var img = new w.Image(),
-			type = "image/webp";
-
-		img.onerror = function() {
-			pf.types[ type ] = false;
-			picturefill();
-		};
-		img.onload = function() {
-			pf.types[ type ] = img.width === 1;
-			picturefill();
-		};
-		img.src = "data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=";
-	};
-
-	/**
-	 * Takes a source element and checks if its type attribute is present and if so, supported
-	 * Note: for type tests that require a async logic,
-	 * you can define them as a function that'll run only if that type needs to be tested. Just make the test function call picturefill again when it is complete.
-	 * see the async webp test above for example
-	 */
-	pf.verifyTypeSupport = function( source ) {
-		var type = source.getAttribute( "type" );
-		// if type attribute exists, return test result, otherwise return true
-		if ( type === null || type === "" ) {
-			return true;
-		} else {
-			// if the type test is a function, run it and return "pending" status. The function will rerun picturefill on pending elements once finished.
-			if ( typeof( pf.types[ type ] ) === "function" ) {
-				pf.types[ type ]();
-				return "pending";
-			} else {
-				return pf.types[ type ];
 		}
+		return memDescriptor[descriptor];
 	}
+	function chooseLowRes(lowRes, diff, dpr) {
+		return lowRes / dpr > .2 && (lowRes += diff * greed, diff > tHigh && (lowRes += tLow)),
+		lowRes > dpr;
+	}
+	function inView(el) {
+		if (!el.getBoundingClientRect) return !0;
+		var bottom, right, left, top, rect = el.getBoundingClientRect();
+		return !!((bottom = rect.bottom) >= -9 && (top = rect.top) <= vH + 9 && (right = rect.right) >= -9 && (left = rect.left) <= ri.vW + 9 && (bottom || right || left || top));
+	}
+	function applyBestCandidate(img) {
+		var srcSetCandidates, matchingSet = ri.getSet(img), evaluated = !1;
+		"pending" != matchingSet && (evaluated = !0, matchingSet && (srcSetCandidates = ri.setRes(matchingSet),
+			evaluated = ri.applySetCandidate(srcSetCandidates, img))), img[ri.ns].evaled = evaluated;
+	}
+	function ascendingSort(a, b) {
+		return a.res - b.res;
+	}
+	function setSrcToCur(img, src, set) {
+		var candidate;
+		return !set && src && (set = img[ri.ns].sets, set = set && set[set.length - 1]),
+			candidate = getCandidateForSrc(src, set), candidate && (src = ri.makeUrl(src), img[ri.ns].curSrc = src,
+			img[ri.ns].curCan = candidate, currentSrcSupported || (img.currentSrc = src), candidate.res || setResolution(candidate, candidate.set.sizes)),
+			candidate;
+	}
+	function getCandidateForSrc(src, set) {
+		var i, candidate, candidates;
+		if (src && set) for (candidates = ri.parseSet(set), src = ri.makeUrl(src), i = 0; i < candidates.length; i++) if (src == ri.makeUrl(candidates[i].url)) {
+			candidate = candidates[i];
+			break;
+		}
+		return candidate;
+	}
+	function hasOneX(set) {
+		var i, ret, candidates, desc;
+		if (set) for (candidates = ri.parseSet(set), i = 0; i < candidates.length; i++) if (desc = candidates[i].desc,
+			"x" == desc.type && 1 == desc.val) {
+			ret = !0;
+			break;
+		}
+		return ret;
+	}
+	function hasWDescripor(set) {
+		if (!set) return !1;
+		var candidates = ri.parseSet(set);
+		return candidates[0] && "w" == candidates[0].desc.type;
+	}
+	function getAllSourceElements(picture, candidates) {
+		var i, len, source, srcset, sources = picture.getElementsByTagName("source");
+		for (i = 0, len = sources.length; len > i; i++) source = sources[i], source[ri.ns] = !0,
+			srcset = source.getAttribute("srcset"), srcset && candidates.push({
+			srcset: srcset,
+			media: source.getAttribute("media"),
+			type: source.getAttribute("type"),
+			sizes: source.getAttribute("sizes")
+		});
+	}
+	function setResolution(candidate, sizesattr) {
+		var descriptor = candidate.desc;
+		return "w" == descriptor.type ? (candidate.cWidth = ri.calcListLength(sizesattr || "100vw"),
+			candidate.res = descriptor.val / candidate.cWidth) : candidate.res = descriptor.val,
+			candidate;
+	}
+	document.createElement("picture");
+	var lengthElInstered, lengthEl, currentSrcSupported, curSrcProp, ri = {}, noop = function() {}, image = document.createElement("img"), getImgAttr = image.getAttribute, setImgAttr = image.setAttribute, removeImgAttr = image.removeAttribute, docElem = document.documentElement, types = {}, cfg = {
+		addSize: !1,
+		xQuant: 1,
+		tLow: .1,
+		tHigh: .5,
+		tLazy: .1,
+		greed: .32
+	}, srcAttr = "data-risrc", srcsetAttr = srcAttr + "set";
+	ri.ns = ("ri" + new Date().getTime()).substr(0, 9), currentSrcSupported = "currentSrc" in image,
+		curSrcProp = currentSrcSupported ? "currentSrc" : "src", ri.supSrcset = "srcset" in image,
+		ri.supSizes = "sizes" in image, ri.selShort = "picture > img, img[srcset]", ri.sel = ri.selShort,
+		ri.cfg = cfg, ri.supSrcset && (ri.sel += ", img[" + srcsetAttr + "]");
+	var anchor = document.createElement("a");
+	ri.makeUrl = function(src) {
+		return anchor.href = src, anchor.href;
+	}, ri.qsa = function(context, sel) {
+		return context.querySelectorAll(sel);
 	};
-
+	{
-	/**
+		var on = (window.console && "function" == typeof console.warn ? function(message) {
-	 * Parses an individual `size` and returns the length, and optional media query
+			console.warn(message);
-	 */
+		} : noop, function(obj, evt, fn, capture) {
-	pf.parseSize = function( sourceSizeStr ) {
+			obj.addEventListener ? obj.addEventListener(evt, fn, capture || !1) : obj.attachEvent && obj.attachEvent("on" + evt, fn);
-		var match = /(\([^)]+\))?\s*(.+)/g.exec( sourceSizeStr );
+		}), off = function(obj, evt, fn, capture) {
-		return {
+			obj.removeEventListener ? obj.removeEventListener(evt, fn, capture || !1) : obj.detachEvent && obj.detachEvent("on" + evt, fn);
+		};
+		"https:" == location.protocol;
+	}
+	ri.matchesMedia = function() {
+		return ri.matchesMedia = window.matchMedia && (matchMedia("(min-width: 0.1em)") || {}).matches ? function(media) {
+			return !media || matchMedia(media).matches;
+		} : ri.mMQ, ri.matchesMedia.apply(this, arguments);
+	}, ri.vW = 0;
+	var vH, isVwDirty = !0, regex = {
+		minw: /\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,
+		maxw: /\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/
+	}, mediaCache = {};
+	ri.mMQ = function(media) {
+		var min, max, ret = !1;
+		return media ? (mediaCache[media] || (min = media.match(regex.minw) && parseFloat(RegExp.$1) + (RegExp.$2 || ""),
+			max = media.match(regex.maxw) && parseFloat(RegExp.$1) + (RegExp.$2 || ""), min && (min = parseFloat(min, 10) * (min.indexOf("em") > 0 ? ri.getEmValue() : 1)),
+		max && (max = parseFloat(max, 10) * (max.indexOf("em") > 0 ? ri.getEmValue() : 1)),
+			mediaCache[media] = {
+				min: min,
+				max: max
+			}), min = mediaCache[media].min, max = mediaCache[media].max, (min && ri.vW >= min || max && ri.vW <= max) && (ret = !0),
+			ret) : !0;
+	}, ri.DPR = window.devicePixelRatio || 1;
+	var lengthCache = {}, regLength = /^([\d\.]+)(em|vw|px)$/, baseStyle = "position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;";
+	ri.calcLength = function(sourceSizeValue) {
+		var failed, parsedLength, orirgValue = sourceSizeValue, value = !1;
+		if (!(orirgValue in lengthCache)) {
+			if (parsedLength = sourceSizeValue.match(regLength)) parsedLength[1] = parseFloat(parsedLength[1], 10),
+				value = parsedLength[1] ? "vw" == parsedLength[2] ? ri.vW * parsedLength[1] / 100 : "em" == parsedLength[2] ? ri.getEmValue() * parsedLength[1] : parsedLength[1] : !1; else if (sourceSizeValue.indexOf("calc") > -1 || parseInt(sourceSizeValue, 10)) {
+				sourceSizeValue = sourceSizeValue.replace("vw", "%"), lengthEl || (lengthEl = document.createElement("div"),
+					lengthEl.style.cssText = baseStyle), lengthElInstered || (lengthElInstered = !0,
+					docElem.insertBefore(lengthEl, docElem.firstChild)), lengthEl.style.width = "0px";
+				try {
+					lengthEl.style.width = sourceSizeValue;
+				} catch (e) {
+					failed = !0;
+				}
+				value = lengthEl.offsetWidth, failed && (value = !1);
+			}
+			0 >= value && (value = !1), lengthCache[orirgValue] = value;
+		}
+		return lengthCache[orirgValue];
+	}, ri.types = types, types["image/jpeg"] = !0, types["image/gif"] = !0, types["image/png"] = !0,
+		types["image/svg+xml"] = document.implementation.hasFeature("http://wwwindow.w3.org/TR/SVG11/feature#Image", "1.1"),
+		ri.supportsType = function(type) {
+			return type ? types[type] : !0;
+		};
+	var regSize = /(\([^)]+\))?\s*(.+)/, memSize = {};
+	ri.parseSize = function(sourceSizeStr) {
+		var match;
+		return memSize[sourceSizeStr] || (match = (sourceSizeStr || "").match(regSize),
+			memSize[sourceSizeStr] = {
 				media: match && match[1],
 				length: match && match[2]
-		};
+			}), memSize[sourceSizeStr];
-	};
+	}, ri.parseSet = function(set) {
-
+		if (!set.cands) {
-	/**
+			var pos, url, descriptor, last, descpos, srcset = set.srcset;
-	 * Takes a string of sizes and returns the width in pixels as a number
+			for (set.cands = []; srcset; ) srcset = srcset.replace(/^\s+/g, ""), pos = srcset.search(/\s/g),
-	 */
+				descriptor = null, -1 != pos ? (url = srcset.slice(0, pos), last = url.charAt(url.length - 1),
-	pf.findWidthFromSourceSize = function( sourceSizeListStr ) {
+			"," != last && url || (url = url.replace(/,+$/, ""), descriptor = ""), srcset = srcset.slice(pos + 1),
-		// Split up source size list, ie ( max-width: 30em ) 100%, ( max-width: 50em ) 50%, 33%
+			null == descriptor && (descpos = srcset.indexOf(","), -1 != descpos ? (descriptor = srcset.slice(0, descpos),
-		//                            or (min-width:30em) calc(30% - 15px)
+				srcset = srcset.slice(descpos + 1)) : (descriptor = srcset, srcset = ""))) : (url = srcset,
-		var sourceSizeList = pf.trim( sourceSizeListStr ).split( /\s*,\s*/ ),
+				srcset = ""), url && (descriptor = parseDescriptor(descriptor)) && set.cands.push({
-			winningLength;
+				url: url.replace(/^,+/, ""),
-
+				desc: descriptor,
-		for ( var i = 0, len = sourceSizeList.length; i < len; i++ ) {
+				set: set
-			// Match <media-condition>? length, ie ( min-width: 50em ) 100%
-			var sourceSize = sourceSizeList[ i ],
-			// Split "( min-width: 50em ) 100%" into separate strings
-				parsedSize = pf.parseSize( sourceSize ),
-				length = parsedSize.length,
-				media = parsedSize.media;
-
-			if ( !length ) {
-				continue;
-			}
-			if ( !media || pf.matchesMedia( media ) ) {
-				// if there is no media query or it matches, choose this as our winning length
-				// and end algorithm
-				winningLength = length;
-				break;
-			}
-		}
-
-		// pass the length to a method that can properly determine length
-		// in pixels based on these formats: http://dev.w3.org/csswg/css-values-3/#length-value
-		return pf.getWidthFromLength( winningLength );
-	};
-
-	pf.parseSrcset = function( srcset ) {
-		/**
-		 * A lot of this was pulled from Boris Smus’ parser for the now-defunct WHATWG `srcset`
-		 * https://github.com/borismus/srcset-polyfill/blob/master/js/srcset-info.js
-		 *
-		 * 1. Let input (`srcset`) be the value passed to this algorithm.
-		 * 2. Let position be a pointer into input, initially pointing at the start of the string.
-		 * 3. Let raw candidates be an initially empty ordered list of URLs with associated
-		 *    unparsed descriptors. The order of entries in the list is the order in which entries
-		 *    are added to the list.
-		 */
-		var candidates = [];
-
-		while ( srcset !== "" ) {
-			srcset = srcset.replace(/^\s+/g,"");
-
-			// 5. Collect a sequence of characters that are not space characters, and let that be url.
-			var pos = srcset.search(/\s/g),
-				url, descriptor = null;
-
-			if ( pos !== -1 ) {
-				url = srcset.slice( 0, pos );
-
-				var last = url[ url.length - 1 ];
-
-				// 6. If url ends with a U+002C COMMA character (,), remove that character from url
-				// and let descriptors be the empty string. Otherwise, follow these substeps
-				// 6.1. If url is empty, then jump to the step labeled descriptor parser.
-
-				if ( last === "," || url === "" ) {
-					url = url.replace(/,+$/, "");
-					descriptor = "";
-				}
-				srcset = srcset.slice( pos + 1 );
-
-				// 6.2. Collect a sequence of characters that are not U+002C COMMA characters (,), and
-				// let that be descriptors.
-				if ( descriptor === null ) {
-					var descpos = srcset.indexOf(",");
-					if ( descpos !== -1 ) {
-						descriptor = srcset.slice( 0, descpos );
-						srcset = srcset.slice( descpos + 1 );
-					} else {
-						descriptor = srcset;
-						srcset = "";
-					}
-				}
-			} else {
-				url = srcset;
-				srcset = "";
-			}
-
-			// 7. Add url to raw candidates, associated with descriptors.
-			if ( url || descriptor ) {
-				candidates.push({
-					url: url,
-					descriptor: descriptor
 			});
 		}
+		return set.cands;
+	};
+	var eminpx, memDescriptor = {}, regDescriptor = /^([\+eE\d\.]+)(w|x)$/, fsCss = "font-size:100% !important;";
+	ri.getEmValue = function() {
+		var body;
+		if (!eminpx && (body = document.body)) {
+			var div = document.createElement("div"), originalHTMLCSS = docElem.style.cssText, originalBodyCSS = body.style.cssText;
+			div.style.cssText = baseStyle, docElem.style.cssText = fsCss, body.style.cssText = fsCss,
+				body.appendChild(div), eminpx = div.offsetWidth, body.removeChild(div), eminpx = parseFloat(eminpx, 10),
+				docElem.style.cssText = originalHTMLCSS, body.style.cssText = originalBodyCSS;
+		}
+		return eminpx || 16;
+	};
+	var sizeLengthCache = {};
+	ri.calcListLength = function(sourceSizeListStr) {
+		if (!(sourceSizeListStr in sizeLengthCache) || cfg.uT) {
+			var sourceSize, parsedSize, length, media, i, len, sourceSizeList = trim(sourceSizeListStr).split(/\s*,\s*/), winningLength = !1;
+			for (i = 0, len = sourceSizeList.length; len > i && (sourceSize = sourceSizeList[i],
+				parsedSize = ri.parseSize(sourceSize), length = parsedSize.length, media = parsedSize.media,
+			!length || !ri.matchesMedia(media) || (winningLength = ri.calcLength(length)) === !1); i++) ;
+			sizeLengthCache[sourceSizeListStr] = winningLength ? winningLength : ri.vW;
+		}
+		return sizeLengthCache[sourceSizeListStr];
+	}, ri.setRes = function(set) {
+		var candidates, candidate;
+		if (set) {
+			candidates = ri.parseSet(set);
+			for (var i = 0, len = candidates.length; len > i; i++) candidate = candidates[i],
+			candidate.descriptor || setResolution(candidate, set.sizes);
 		}
 		return candidates;
 	};
-
+	var dprM, tLow, greed, tLazy, tHigh, tMemory, isWinComplete;
-	pf.parseDescriptor = function( descriptor, sizesattr ) {
+	ri.applySetCandidate = function(candidates, img) {
-		// 11. Descriptor parser: Let candidates be an initially empty source set. The order of entries in the list
+		if (candidates.length) {
-		// is the order in which entries are added to the list.
+			var candidate, dpr, i, j, diff, length, bestCandidate, curSrc, curCan, isSameSet, candidateSrc, imageData = img[ri.ns], evaled = !0;
-		var sizes = sizesattr || "100vw",
+			if (curSrc = imageData.curSrc || img[curSrcProp], curCan = imageData.curCan || setSrcToCur(img, curSrc, candidates[0].set),
-			sizeDescriptor = descriptor && descriptor.replace(/(^\s+|\s+$)/g, ""),
+					dpr = ri.getX(candidates, curCan), curSrc && (curCan && (curCan.res += tLazy), isSameSet = !imageData.pic || curCan && curCan.set == candidates[0].set,
-			widthInCssPixels = pf.findWidthFromSourceSize( sizes ),
+					curCan && isSameSet && curCan.res >= dpr && tMemory > curCan.res - dpr ? bestCandidate = curCan : img.complete || imageData.src != getImgAttr.call(img, "src") || img.lazyload || (isSameSet || !isWinComplete && !inView(img)) && (bestCandidate = curCan,
-			resCandidate;
+						candidateSrc = curSrc, evaled = "lazy", isWinComplete && reevaluateAfterLoad(img))),
-
+					!bestCandidate) for (candidates.sort(ascendingSort), length = candidates.length,
-		if ( sizeDescriptor ) {
+											 bestCandidate = candidates[length - 1], i = 0; length > i; i++) if (candidate = candidates[i],
-			var splitDescriptor = sizeDescriptor.split(" ");
+				candidate.res >= dpr) {
-
+				j = i - 1, bestCandidate = candidates[j] && (diff = candidate.res - dpr) && curSrc != ri.makeUrl(candidate.url) && chooseLowRes(candidates[j].res, diff, dpr) ? candidates[j] : candidate;
-			for (var i = splitDescriptor.length + 1; i >= 0; i--) {
+				break;
-				if ( splitDescriptor[ i ] !== undefined ) {
-					var curr = splitDescriptor[ i ],
-						lastchar = curr && curr.slice( curr.length - 1 );
-
-					if ( ( lastchar === "h" || lastchar === "w" ) && !pf.sizesSupported ) {
-						resCandidate = parseFloat( ( parseInt( curr, 10 ) / widthInCssPixels ) );
-					} else if ( lastchar === "x" ) {
-						var res = curr && parseFloat( curr, 10 );
-						resCandidate = res && !isNaN( res ) ? res : 1;
 			}
+			return curSrc && curCan && (curCan.res -= tLazy), bestCandidate && (candidateSrc = ri.makeUrl(bestCandidate.url),
+			currentSrcSupported || (img.currentSrc = candidateSrc), imageData.curSrc = candidateSrc,
+				imageData.curCan = bestCandidate, candidateSrc != curSrc ? ri.setSrc(img, bestCandidate) : ri.setSize(img)),
+				evaled;
 		}
-			}
-		}
-		return resCandidate || 1;
 	};
-
+	ri.getX = function() {
-	/**
+		return ri.DPR * cfg.xQuant;
-	 * Takes a srcset in the form of url/
+	}, ri.setSrc = function(img, bestCandidate) {
-	 * ex. "images/pic-medium.png 1x, images/pic-medium-2x.png 2x" or
+		var origWidth;
-	 *     "images/pic-medium.png 400w, images/pic-medium-2x.png 800w" or
+		img.src = bestCandidate.url, "image/svg+xml" == bestCandidate.set.type && (origWidth = img.style.width,
-	 *     "images/pic-small.png"
+			img.style.width = img.offsetWidth + 1 + "px", img.offsetWidth + 1 && (img.style.width = origWidth));
-	 * Get an array of image candidates in the form of
+	};
-	 *      {url: "/foo/bar.png", resolution: 1}
+	var intrinsicSizeHandler = function() {
-	 * where resolution is http://dev.w3.org/csswg/css-values-3/#resolution-value
+		off(this, "load", intrinsicSizeHandler), ri.setSize(this);
-	 * If sizes is specified, resolution is calculated
+	};
-	 */
+	ri.setSize = function(img) {
-	pf.getCandidatesFromSourceSet = function( srcset, sizes ) {
+		var width, curCandidate = img[ri.ns].curCan;
-		var candidates = pf.parseSrcset( srcset ),
+		cfg.addSize && curCandidate && !img[ri.ns].dims && (img.complete || (off(img, "load", intrinsicSizeHandler),
-			formattedCandidates = [];
+			on(img, "load", intrinsicSizeHandler)), width = img.naturalWidth, width && ("x" == curCandidate.desc.type ? setImgAttr.call(img, "width", parseInt(width / curCandidate.res / cfg.xQuant, 10)) : "w" == curCandidate.desc.type && setImgAttr.call(img, "width", parseInt(curCandidate.cWidth * (width / curCandidate.desc.val), 10))));
-
+	}, document.addEventListener && "naturalWidth" in image && "complete" in image || (ri.setSize = noop),
-		for ( var i = 0, len = candidates.length; i < len; i++ ) {
+		ri.getSet = function(img) {
-			var candidate = candidates[ i ];
+			var i, set, supportsType, match = !1, sets = img[ri.ns].sets;
-
+			for (i = 0; i < sets.length && !match; i++) if (set = sets[i], set.srcset && ri.matchesMedia(set.media) && (supportsType = ri.supportsType(set.type))) {
-			formattedCandidates.push({
+				"pending" == supportsType && (set = supportsType), match = set;
-				url: candidate.url,
+				break;
-				resolution: pf.parseDescriptor( candidate.descriptor, sizes )
+			}
+			return match;
+		};
+	var alwaysCheckWDescriptor = ri.supSrcset && !ri.supSizes;
+	ri.parseSets = function(element, parent) {
+		var srcsetAttribute, fallbackCandidate, isWDescripor, srcsetParsed, hasPicture = "PICTURE" == parent.nodeName.toUpperCase(), imageData = element[ri.ns];
+		imageData.src === undefined && (imageData.src = getImgAttr.call(element, "src"),
+			imageData.src ? setImgAttr.call(element, srcAttr, imageData.src) : removeImgAttr.call(element, srcAttr)),
+		imageData.srcset === undefined && (srcsetAttribute = getImgAttr.call(element, "srcset"),
+			imageData.srcset = srcsetAttribute, srcsetParsed = !0), imageData.dims === undefined && (imageData.dims = getImgAttr.call(element, "height") && getImgAttr.call(element, "width")),
+			imageData.sets = [], hasPicture && (imageData.pic = !0, getAllSourceElements(parent, imageData.sets)),
+			imageData.srcset ? (fallbackCandidate = {
+				srcset: imageData.srcset,
+				sizes: getImgAttr.call(element, "sizes")
+			}, imageData.sets.push(fallbackCandidate), isWDescripor = alwaysCheckWDescriptor || imageData.src ? hasWDescripor(fallbackCandidate) : !1,
+			isWDescripor || !imageData.src || getCandidateForSrc(imageData.src, fallbackCandidate) || hasOneX(fallbackCandidate) || (fallbackCandidate.srcset += ", " + imageData.src,
+				fallbackCandidate.cands = !1)) : imageData.src && imageData.sets.push({
+				srcset: imageData.src,
+				sizes: null
+			}), imageData.curCan = null, imageData.supported = !(hasPicture || fallbackCandidate && !ri.supSrcset || isWDescripor),
+		srcsetParsed && ri.supSrcset && !imageData.supported && (srcsetAttribute ? (setImgAttr.call(element, srcsetAttr, srcsetAttribute),
+			element.srcset = "") : removeImgAttr.call(element, srcsetAttr)), imageData.parsed = !0;
+	};
+	var reevaluateAfterLoad = function() {
+		var onload = function() {
+			off(this, "load", onload), ri.fillImgs({
+				elements: [ this ]
 			});
-		}
-		return formattedCandidates;
 		};
+		return function(img) {
+			off(img, "load", onload), on(img, "load", onload);
+		};
+	}();
+	ri.fillImg = function(element, options) {
+		var parent, imageData, extreme = options.reparse || options.reevaluate;
+		if (element[ri.ns] || (element[ri.ns] = {}), imageData = element[ri.ns], "lazy" == imageData.evaled && (isWinComplete || element.complete) && (imageData.evaled = !1),
+			extreme || !imageData.evaled) {
+			if (!imageData.parsed || options.reparse) {
+				if (parent = element.parentNode, !parent) return;
+				ri.parseSets(element, parent, options);
+			}
+			imageData.supported ? imageData.evaled = !0 : applyBestCandidate(element);
+		}
+	};
+	var resizeThrottle;
+	ri.setupRun = function(options) {
+		(!alreadyRun || options.reevaluate || isVwDirty) && (cfg.uT || (ri.DPR = window.devicePixelRatio || 1),
+			dprM = Math.min(Math.max(ri.DPR * cfg.xQuant, 1), 2.5), tLow = cfg.tLow * dprM,
+			tLazy = cfg.tLazy * dprM, greed = cfg.greed * dprM, tHigh = cfg.tHigh, tMemory = .6 + .4 * dprM + tLazy),
+		isVwDirty && (lengthCache = {}, sizeLengthCache = {}, updateView(), options.elements || options.context || clearTimeout(resizeThrottle));
+	}, ri.teardownRun = function() {
+		var parent;
+		lengthElInstered && (lengthElInstered = !1, parent = lengthEl.parentNode, parent && parent.removeChild(lengthEl));
+	};
+	var alreadyRun = !1, respimage = function(opt) {
+		var elements, i, plen, options = opt || {};
+		if (options.elements && 1 == options.elements.nodeType && ("IMG" == options.elements.nodeName.toUpperCase() ? options.elements = [ options.elements ] : (options.context = options.elements,
+				options.elements = null)), elements = options.elements || ri.qsa(options.context || document, options.reevaluate || options.reparse ? ri.sel : ri.selShort),
+				plen = elements.length) {
+			for (ri.setupRun(options), alreadyRun = !0, i = 0; plen > i; i++) ri.fillImg(elements[i], options);
+			ri.teardownRun(options);
+		}
+	};
+	ri.fillImgs = respimage, window.HTMLPictureElement ? (respimage = noop, ri.fillImg = noop) : !function() {
+		var regWinComplete = /^loade|^c/, run = function() {
+			clearTimeout(timerId), timerId = setTimeout(run, 3e3), document.body && (regWinComplete.test(document.readyState || "") && (isWinComplete = !0,
+				clearTimeout(timerId), off(document, "readystatechange", run)), ri.fillImgs());
+		}, resizeEval = function() {
+			ri.fillImgs({
+				reevaluate: !0
+			});
+		}, onResize = function() {
+			clearTimeout(resizeThrottle), isVwDirty = !0, resizeThrottle = setTimeout(resizeEval, 99);
+		}, timerId = setTimeout(run, document.body ? 9 : 99);
+		on(window, "resize", onResize), on(document, "readystatechange", run);
+	}(), respimage._ = ri, respimage.config = function(name, value, value2) {
+		if ("addType" == name) {
+			if (types[value] = value2, "pending" == value2) return;
+		} else cfg[name] = value;
+		alreadyRun && ri.fillImgs({
+			reevaluate: !0
+		});
+	}, window.respimage = respimage;
+}(window, document);
+(function( factory ) {
+	"use strict";
+	var interValId;
+	var intervalIndex = 0;
+	var run = function(){
+		if ( window.respimage ) {
+			factory( window.respimage );
+		}
+		if(window.respimage || intervalIndex > 9999){
+			clearInterval(interValId);
+		}
+		intervalIndex++;
+	};
+	interValId = setInterval(run, 8);
 
-	/*
+	run();
-	 * if it's an img element and it has a srcset property,
+
-	 * we need to remove the attribute so we can manipulate src
+}( function( respimage ) {
-	 * (the property's existence infers native srcset support, and a srcset-supporting browser will prioritize srcset's value over our winning picture candidate)
+	"use strict";
-	 * this moves srcset's value to memory for later use and removes the attr
+
-	 */
+	var ri = respimage._;
-	pf.dodgeSrcset = function( img ) {
+	var runningTests = 0;
-		if ( img.srcset ) {
+	var setTypeValue = function(types, value){
-			img[ pf.ns ].srcset = img.srcset;
+		var i;
-			img.removeAttribute( "srcset" );
+		for(i = 0; i < types.length; i++){
+			ri.types[types[i]] = value;
 		}
 	};
 
-	/*
+	if(window.HTMLPictureElement && !ri.cfg.uT){
-	 * Accept a source or img element and process its srcset and sizes attrs
+		respimage.testTypeSupport = function(){};
-	 */
-	pf.processSourceSet = function( el ) {
-		var srcset = el.getAttribute( "srcset" ),
-			sizes = el.getAttribute( "sizes" ),
-			candidates = [];
-
-		// if it's an img element, use the cached srcset property (defined or not)
-		if ( el.nodeName.toUpperCase() === "IMG" && el[ pf.ns ] && el[ pf.ns ].srcset ) {
-			srcset = el[ pf.ns ].srcset;
-		}
-
-		if ( srcset ) {
-			candidates = pf.getCandidatesFromSourceSet( srcset, sizes );
-		}
-		return candidates;
-	};
-
-	pf.applyBestCandidate = function( candidates, picImg ) {
-		var candidate,
-			length,
-			bestCandidate;
-
-		candidates.sort( pf.ascendingSort );
-
-		length = candidates.length;
-		bestCandidate = candidates[ length - 1 ];
-
-		for ( var i = 0; i < length; i++ ) {
-			candidate = candidates[ i ];
-			if ( candidate.resolution >= pf.getDpr() ) {
-				bestCandidate = candidate;
-				break;
-			}
-		}
-
-		if ( bestCandidate && !pf.endsWith( picImg.src, bestCandidate.url ) ) {
-			picImg.src = bestCandidate.url;
-			// currentSrc attribute and property to match
-			// http://picture.responsiveimages.org/#the-img-element
-			picImg.currentSrc = picImg.src;
-		}
-	};
-
-	pf.ascendingSort = function( a, b ) {
-		return a.resolution - b.resolution;
-	};
-
-	/*
-	 * In IE9, <source> elements get removed if they aren't children of
-	 * video elements. Thus, we conditionally wrap source elements
-	 * using <!--[if IE 9]><video style="display: none;"><![endif]-->
-	 * and must account for that here by moving those source elements
-	 * back into the picture element.
-	 */
-	pf.removeVideoShim = function( picture ) {
-		var videos = picture.getElementsByTagName( "video" );
-		if ( videos.length ) {
-			var video = videos[ 0 ],
-				vsources = video.getElementsByTagName( "source" );
-			while ( vsources.length ) {
-				picture.insertBefore( vsources[ 0 ], video );
-			}
-			// Remove the video element once we're finished removing its children
-			video.parentNode.removeChild( video );
-		}
-	};
-
-	/*
-	 * Find all `img` elements, and add them to the candidate list if they have
-	 * a `picture` parent, a `sizes` attribute in basic `srcset` supporting browsers,
-	 * a `srcset` attribute at all, and they haven’t been evaluated already.
-	 */
-	pf.getAllElements = function() {
-		var elems = [],
-			imgs = doc.getElementsByTagName( "img" );
-
-		for ( var h = 0, len = imgs.length; h < len; h++ ) {
-			var currImg = imgs[ h ];
-
-			if ( currImg.parentNode.nodeName.toUpperCase() === "PICTURE" ||
-				( currImg.getAttribute( "srcset" ) !== null ) || currImg[ pf.ns ] && currImg[ pf.ns ].srcset !== null ) {
-				elems.push( currImg );
-			}
-		}
-		return elems;
-	};
-
-	pf.getMatch = function( img, picture ) {
-		var sources = picture.childNodes,
-			match;
-
-		// Go through each child, and if they have media queries, evaluate them
-		for ( var j = 0, slen = sources.length; j < slen; j++ ) {
-			var source = sources[ j ];
-
-			// ignore non-element nodes
-			if ( source.nodeType !== 1 ) {
-				continue;
-			}
-
-			// Hitting the `img` element that started everything stops the search for `sources`.
-			// If no previous `source` matches, the `img` itself is evaluated later.
-			if ( source === img ) {
-				return match;
-			}
-
-			// ignore non-`source` nodes
-			if ( source.nodeName.toUpperCase() !== "SOURCE" ) {
-				continue;
-			}
-			// if it's a source element that has the `src` property set, throw a warning in the console
-			if ( source.getAttribute( "src" ) !== null && typeof console !== undefined ){
-				console.warn("The `src` attribute is invalid on `picture` `source` element; instead, use `srcset`.");
-			}
-
-			var media = source.getAttribute( "media" );
-
-			// if source does not have a srcset attribute, skip
-			if ( !source.getAttribute( "srcset" ) ) {
-				continue;
-			}
-
-			// if there's no media specified, OR w.matchMedia is supported
-			if ( ( !media || pf.matchesMedia( media ) ) ) {
-				var typeSupported = pf.verifyTypeSupport( source );
-
-				if ( typeSupported === true ) {
-					match = source;
-					break;
-				} else if ( typeSupported === "pending" ) {
-					return false;
-				}
-			}
-		}
-
-		return match;
-	};
-
-	function picturefill( opt ) {
-		var elements,
-			element,
-			parent,
-			firstMatch,
-			candidates,
-
-			options = opt || {};
-		elements = options.elements || pf.getAllElements();
-
-		// Loop through all elements
-		for ( var i = 0, plen = elements.length; i < plen; i++ ) {
-			element = elements[ i ];
-			parent = element.parentNode;
-			firstMatch = undefined;
-			candidates = undefined;
-
-			// expando for caching data on the img
-			if ( !element[ pf.ns ] ) {
-				element[ pf.ns ] = {};
-			}
-
-			// if the element has already been evaluated, skip it
-			// unless `options.force` is set to true ( this, for example,
-			// is set to true when running `picturefill` on `resize` ).
-			if ( !options.reevaluate && element[ pf.ns ].evaluated ) {
-				continue;
-			}
-
-			// if `img` is in a `picture` element
-			if ( parent.nodeName.toUpperCase() === "PICTURE" ) {
-
-				// IE9 video workaround
-				pf.removeVideoShim( parent );
-
-				// return the first match which might undefined
-				// returns false if there is a pending source
-				// TODO the return type here is brutal, cleanup
-				firstMatch = pf.getMatch( element, parent );
-
-				// if any sources are pending in this picture due to async type test(s)
-				// remove the evaluated attr and skip for now ( the pending test will
-				// rerun picturefill on this element when complete)
-				if ( firstMatch === false ) {
-					continue;
-				}
-			} else {
-				firstMatch = undefined;
-			}
-
-			// Cache and remove `srcset` if present and we’re going to be doing `picture`/`srcset`/`sizes` polyfilling to it.
-			if ( parent.nodeName.toUpperCase() === "PICTURE" ||
-				( element.srcset && !pf.srcsetSupported ) ||
-				( !pf.sizesSupported && ( element.srcset && element.srcset.indexOf("w") > -1 ) ) ) {
-				pf.dodgeSrcset( element );
-			}
-
-			if ( firstMatch ) {
-				candidates = pf.processSourceSet( firstMatch );
-				pf.applyBestCandidate( candidates, element );
-			} else {
-				// No sources matched, so we’re down to processing the inner `img` as a source.
-				candidates = pf.processSourceSet( element );
-
-				if ( element.srcset === undefined || element[ pf.ns ].srcset ) {
-					// Either `srcset` is completely unsupported, or we need to polyfill `sizes` functionality.
-					pf.applyBestCandidate( candidates, element );
-				} // Else, resolution-only `srcset` is supported natively.
-			}
-
-			// set evaluated to true to avoid unnecessary reparsing
-			element[ pf.ns ].evaluated = true;
-		}
-	}
-
-	/**
-	 * Sets up picture polyfill by polling the document and running
-	 * the polyfill every 250ms until the document is ready.
-	 * Also attaches picturefill on resize
-	 */
-	function runPicturefill() {
-		picturefill();
-		var intervalId = setInterval( function() {
-			// When the document has finished loading, stop checking for new images
-			// https://github.com/ded/domready/blob/master/ready.js#L15
-			picturefill();
-			if ( /^loaded|^i|^c/.test( doc.readyState ) ) {
-				clearInterval( intervalId );
 		return;
 	}
-		}, 250 );
+
-		if ( w.addEventListener ) {
+	ri.types["image/bmp"] = true;
-			var resizeThrottle;
+	ri.types["image/x-bmp"] = true;
-			w.addEventListener( "resize", function() {
+
-				if (!w._picturefillWorking) {
+	respimage.testTypeSupport = function(types, url, width, useCanvas){
-					w._picturefillWorking = true;
+		if(typeof types == "string"){
-					w.clearTimeout( resizeThrottle );
+			types = types.split(/\s*\,*\s+/g);
-					resizeThrottle = w.setTimeout( function() {
-						picturefill({ reevaluate: true });
-						w._picturefillWorking = false;
-					}, 60 );
 		}
-			}, false );
+		var canvas;
+		var supports = "pending";
+		var img = document.createElement('img');
+		var onComplete = function(){
+			runningTests--;
+			setTypeValue(types, supports);
+			if(runningTests < 1){
+				respimage({reevaluate: true});
+			}
+		};
+
+		if(useCanvas){
+			canvas = document.createElement('canvas');
+			if(!canvas.getContext){
+				setTypeValue(types, false);
+				return;
 			}
 		}
 
-	runPicturefill();
+		img.onload = function(){
+			var ctx;
+			supports = true;
+			if(width){
+				supports = img.width == width;
+			}
 
-	/* expose methods for testing */
+			if(useCanvas){
-	picturefill._ = pf;
+				ctx = canvas.getContext('2d');
+				ctx.drawImage(img, 0, 0);
+				supports = ctx.getImageData(0, 0, 1, 1).data[3] === 0;
+			}
+			onComplete();
+		};
 
-	/* expose picturefill */
+		img.onerror = function(){
-	w.picturefill = picturefill;
+			supports = false;
+			onComplete();
+		};
+		runningTests++;
+		setTypeValue(types, "pending");
+		img.src = url;
+	};
+
+
+	respimage.testTypeSupport("image/webp", "data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==", 1);
+	respimage.testTypeSupport("image/jp2 image/jpx image/jpm", "data:image/jp2;base64,AAAADGpQICANCocKAAAAFGZ0eXBqcDIgAAAAAGpwMiAAAABHanAyaAAAABZpaGRyAAAAAQAAAAEAAQAHAAAAAAAPY29scgEAAAAAABEAAAAacmVzIAAAABJyZXNjAGAA/gBgAP4EBAAAAABqcDJj/0//UQApAAAAAAABAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAAABAAEB/1wADUAIEBAYEBAYEBAY/1IADAAAAAEAAwQEAAH/ZAAPAAFMV0ZfSlAyXzIxMf+QAAoAAAAAABIAAf+TgICAgP/Z", 1);
+	respimage.testTypeSupport("image/vnd.ms-photo", "data:image/vnd.ms-photo;base64,SUm8AQgAAAAFAAG8AQAQAAAASgAAAIC8BAABAAAAAQAAAIG8BAABAAAAAQAAAMC8BAABAAAAWgAAAMG8BAABAAAAHwAAAAAAAAAkw91vA07+S7GFPXd2jckNV01QSE9UTwAZAYBxAAAAABP/gAAEb/8AAQAAAQAAAA==", 1);
+	respimage.testTypeSupport("video/png video/apng video/x-mng video/x-png", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACGFjVEwAAAABAAAAAcMq2TYAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAGmZjVEwAAAAAAAAAAQAAAAEAAAAAAAAAAAD6A+gBAbNU+2sAAAARZmRBVAAAAAEImWNgYGBgAAAABQAB6MzFdgAAAABJRU5ErkJggg==", false, true);
+
+}));
 
 (function(){
 
@@ -570,11 +431,10 @@ webshim.ready('matchMedia', function($, webshim, w, doc, undefined){
 	var sel = 'picture, img[srcset]';
 	webshim.addReady(function(context){
 		if(context.querySelector(sel)){
-				window.picturefill();
+			window.respimage();
 		}
 	});
 })();
-} );
 
 
 ;/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas, David Knight. Dual MIT/BSD license */

public/webshims/shims/combos/2.js

@@ -325,20 +325,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -759,7 +764,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1711,6 +1716,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/21.js

@@ -1463,6 +1463,25 @@
 			VIDEO: 1
 		};
 		var tested = {};
+		var addToBlob = function(){
+			var desc = webshim.defineNodeNameProperty('canvas', 'toBlob', {
+				prop: {
+					value: function(){
+						var context = $(this).callProp('getContext', ['2d']);
+						var that = this;
+						var args = arguments;
+						var cb = function(){
+							return desc.prop._supvalue.apply(that, args);
+						};
+						if(context.wsImageComplete && context._wsIsLoading){
+							context.wsImageComplete(cb);
+						} else {
+							return cb();
+						}
+					}
+				}
+			});
+		};
 
 		if(!_drawImage){
 			webshim.error('canvas.drawImage feature is needed. In IE8 flashvanvas pro can be used');
@@ -1537,6 +1556,12 @@
 			}
 			return _drawImage.apply(this, arguments);
 		};
+
+		if(!document.createElement('canvas').toBlob){
+			webshims.ready('filereader', addToBlob);
+		} else {
+			addToBlob();
+		}
 		return true;
 	};
 
@@ -1810,10 +1835,11 @@
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -1854,6 +1880,7 @@
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -1866,6 +1893,16 @@
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/combos/22.js

@@ -260,10 +260,11 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -304,6 +305,7 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -316,6 +318,16 @@ webshims.register('details', function($, webshims, window, doc, undefined, optio
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/combos/25.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1611,11 +1616,9 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						qualitiy = 0.8;
 					}
 					loadMoxie();
-					setTimeout(function(){
-						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 					webshim.ready('moxie', function(){
 						var img = new mOxie.Image();
-
+						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 						img.onload = function() {
 							var blob = img.getAsBlob();
 							webshim.defineProperty(blob, '_wsDataURL', {
@@ -1626,7 +1629,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 						};
 						img.load(dataURL);
 					});
-					}, 9);
 				}
 			}
 		});
@@ -2896,6 +2898,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			VIDEO: 1
 		};
 		var tested = {};
+		var addToBlob = function(){
+			var desc = webshim.defineNodeNameProperty('canvas', 'toBlob', {
+				prop: {
+					value: function(){
+						var context = $(this).callProp('getContext', ['2d']);
+						var that = this;
+						var args = arguments;
+						var cb = function(){
+							return desc.prop._supvalue.apply(that, args);
+						};
+						if(context.wsImageComplete && context._wsIsLoading){
+							context.wsImageComplete(cb);
+						} else {
+							return cb();
+						}
+					}
+				}
+			});
+		};
 
 		if(!_drawImage){
 			webshim.error('canvas.drawImage feature is needed. In IE8 flashvanvas pro can be used');
@@ -2970,6 +2991,12 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			}
 			return _drawImage.apply(this, arguments);
 		};
+
+		if(!document.createElement('canvas').toBlob){
+			webshims.ready('filereader', addToBlob);
+		} else {
+			addToBlob();
+		}
 		return true;
 	};
 

public/webshims/shims/combos/27.js

@@ -1632,11 +1632,9 @@ webshims.register('form-shim-extend2', function($, webshims, window, document, u
 						qualitiy = 0.8;
 					}
 					loadMoxie();
-					setTimeout(function(){
-						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 					webshim.ready('moxie', function(){
 						var img = new mOxie.Image();
-
+						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 						img.onload = function() {
 							var blob = img.getAsBlob();
 							webshim.defineProperty(blob, '_wsDataURL', {
@@ -1647,7 +1645,6 @@ webshims.register('form-shim-extend2', function($, webshims, window, document, u
 						};
 						img.load(dataURL);
 					});
-					}, 9);
 				}
 			}
 		});

public/webshims/shims/combos/28.js

@@ -607,21 +607,24 @@ if(webshims.support.inputtypes.date && /webkit/i.test(navigator.userAgent)){
 
 webshims.addReady(function(context, contextElem){
 	//start constrain-validation
-	var focusElem;
+
 	$('form', context)
 		.add(contextElem.filter('form'))
 		.on('invalid', $.noop)
 	;
 
+	setTimeout(function(){
+		var focusElem;
 		try {
-		if(context == document && !('form' in (document.activeElement || {}))) {
+			if(!('form' in (document.activeElement || {}))) {
 				focusElem = $(context.querySelector('input[autofocus], select[autofocus], textarea[autofocus]')).eq(0).getShadowFocusElement()[0];
-			if (focusElem && focusElem.offsetHeight && focusElem.offsetWidth) {
+				if (focusElem && (focusElem.offsetHeight || focusElem.offsetWidth)) {
 					focusElem.focus();
 				}
 			}
 		}
 		catch (er) {}
+	}, 9);
 
 });
 

public/webshims/shims/combos/3.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1488,6 +1493,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/30.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1488,6 +1493,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/31.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1488,6 +1493,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/34.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1343,10 +1348,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -1387,6 +1393,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -1399,6 +1406,16 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/combos/4.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;

public/webshims/shims/combos/5.js

@@ -1871,9 +1871,13 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -2028,6 +2032,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -2049,8 +2054,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -2352,9 +2356,11 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2478,7 +2484,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -2507,7 +2512,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/combos/6.js

@@ -1871,9 +1871,13 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -2028,6 +2032,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -2049,8 +2054,7 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -2352,9 +2356,11 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2478,7 +2484,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -2507,7 +2512,6 @@ webshims.register('form-native-extend', function($, webshims, window, doc, undef
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/combos/7.js

@@ -325,20 +325,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -759,7 +764,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1711,6 +1716,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/8.js

@@ -325,20 +325,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -759,7 +764,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -1711,6 +1716,8 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/combos/9.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;
@@ -2275,9 +2280,13 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -2432,6 +2441,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -2453,8 +2463,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -2756,9 +2765,11 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -2882,7 +2893,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -2911,7 +2921,6 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/dom-extend.js

@@ -102,20 +102,25 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 	};
 	
 	//jquery mobile and jquery ui
-	if(!$.widget){
+	if(!$.widget && (!$.pluginFactory || !$.pluginFactory.mixin)){
 		(function(){
 			var _cleanData = $.cleanData;
-			$.cleanData = function( elems ) {
+			$.cleanData = (function( orig ) {
-				if(!$.widget){
+				return function( elems ) {
-					for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+					var events, elem, i;
+					for ( i = 0; (elem = elems[i]) != null; i++ ) {
 						try {
+							// Only trigger remove when necessary to save time
+							events = $._data( elem, "events" );
+							if ( events && events.remove ) {
 								$( elem ).triggerHandler( "remove" );
+							}
 							// http://bugs.jquery.com/ticket/8235
 						} catch ( e ) {}
 					}
-				}
+					orig( elems );
-				_cleanData( elems );
 				};
+			})( $.cleanData );
 		})();
 	}
 	
@@ -536,7 +541,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
 				return id;
 			};
 		})(),
-		domPrefixes: ["ws", "webkit", "moz", "ms", "o"],
+		domPrefixes: ["webkit", "moz", "ms", "o", "ws"],
 
 		prefixed: function (prop, obj){
 			var i, testProp;

public/webshims/shims/es5.js

@@ -16,31 +16,37 @@ setTimeout(function(){
 
 // Shortcut to an often accessed properties, in order to avoid multiple
 // dereference that costs universally.
-	var call = Function.prototype.call;
+	var ArrayPrototype = Array.prototype;
-	var prototypeOfArray = Array.prototype;
+	var ObjectPrototype = Object.prototype;
-	var prototypeOfObject = Object.prototype;
+	var FunctionPrototype = Function.prototype;
-	var _Array_slice_ = prototypeOfArray.slice;
+	var StringPrototype = String.prototype;
-	var array_splice = Array.prototype.splice;
+	var NumberPrototype = Number.prototype;
-	var array_push = Array.prototype.push;
+	var array_slice = ArrayPrototype.slice;
-	var array_unshift = Array.prototype.unshift;
+	var array_splice = ArrayPrototype.splice;
+	var array_push = ArrayPrototype.push;
+	var array_unshift = ArrayPrototype.unshift;
+	var call = FunctionPrototype.call;
 
 // Having a toString local variable name breaks in Opera so use _toString.
-	var _toString = prototypeOfObject.toString;
+	var _toString = ObjectPrototype.toString;
 
 	var isFunction = function (val) {
-		return prototypeOfObject.toString.call(val) === '[object Function]';
+		return ObjectPrototype.toString.call(val) === '[object Function]';
 	};
 	var isRegex = function (val) {
-		return prototypeOfObject.toString.call(val) === '[object RegExp]';
+		return ObjectPrototype.toString.call(val) === '[object RegExp]';
 	};
 	var isArray = function isArray(obj) {
 		return _toString.call(obj) === "[object Array]";
 	};
+	var isString = function isString(obj) {
+		return _toString.call(obj) === "[object String]";
+	};
 	var isArguments = function isArguments(value) {
 		var str = _toString.call(value);
 		var isArgs = str === '[object Arguments]';
 		if (!isArgs) {
-			isArgs = !isArray(str)
+			isArgs = !isArray(value)
 			&& value !== null
 			&& typeof value === 'object'
 			&& typeof value.length === 'number'
@@ -50,6 +56,107 @@ setTimeout(function(){
 		return isArgs;
 	};
 
+	var supportsDescriptors = Object.defineProperty && (function () {
+			try {
+				Object.defineProperty({}, 'x', {});
+				return true;
+			} catch (e) { /* this is ES3 */
+				return false;
+			}
+		}());
+
+// Define configurable, writable and non-enumerable props
+// if they don't exist.
+	var defineProperty;
+	if (supportsDescriptors) {
+		defineProperty = function (object, name, method, forceAssign) {
+			if (!forceAssign && (name in object)) { return; }
+			Object.defineProperty(object, name, {
+				configurable: true,
+				enumerable: false,
+				writable: true,
+				value: method
+			});
+		};
+	} else {
+		defineProperty = function (object, name, method, forceAssign) {
+			if (!forceAssign && (name in object)) { return; }
+			object[name] = method;
+		};
+	}
+	var defineProperties = function (object, map, forceAssign) {
+		for (var name in map) {
+			if (ObjectPrototype.hasOwnProperty.call(map, name)) {
+				defineProperty(object, name, map[name], forceAssign);
+			}
+		}
+	};
+
+//
+// Util
+// ======
+//
+
+// ES5 9.4
+// http://es5.github.com/#x9.4
+// http://jsperf.com/to-integer
+
+	function toInteger(n) {
+		n = +n;
+		if (n !== n) { // isNaN
+			n = 0;
+		} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+			n = (n > 0 || -1) * Math.floor(Math.abs(n));
+		}
+		return n;
+	}
+
+	function isPrimitive(input) {
+		var type = typeof input;
+		return (
+		input === null ||
+		type === "undefined" ||
+		type === "boolean" ||
+		type === "number" ||
+		type === "string"
+		);
+	}
+
+	function toPrimitive(input) {
+		var val, valueOf, toStr;
+		if (isPrimitive(input)) {
+			return input;
+		}
+		valueOf = input.valueOf;
+		if (isFunction(valueOf)) {
+			val = valueOf.call(input);
+			if (isPrimitive(val)) {
+				return val;
+			}
+		}
+		toStr = input.toString;
+		if (isFunction(toStr)) {
+			val = toStr.call(input);
+			if (isPrimitive(val)) {
+				return val;
+			}
+		}
+		throw new TypeError();
+	}
+
+// ES5 9.9
+// http://es5.github.com/#x9.9
+	var toObject = function (o) {
+		if (o == null) { // this matches both null and undefined
+			throw new TypeError("can't convert " + o + " to object");
+		}
+		return Object(o);
+	};
+
+	var ToUint32 = function ToUint32(x) {
+		return x >>> 0;
+	};
+
 //
 // Function
 // ========
@@ -60,8 +167,8 @@ setTimeout(function(){
 
 	function Empty() {}
 
-	if (!Function.prototype.bind) {
+	defineProperties(FunctionPrototype, {
-		Function.prototype.bind = function bind(that) { // .length is 1
+		bind: function bind(that) { // .length is 1
 			// 1. Let Target be the this value.
 			var target = this;
 			// 2. If IsCallable(Target) is false, throw a TypeError exception.
@@ -71,7 +178,7 @@ setTimeout(function(){
 			// 3. Let A be a new (possibly empty) internal list of all of the
 			//   argument values provided after thisArg (arg1, arg2 etc), in order.
 			// XXX slicedArgs will stand in for "A" if used
-			var args = _Array_slice_.call(arguments, 1); // for normal call
+			var args = array_slice.call(arguments, 1); // for normal call
 			// 4. Let F be a new native ECMAScript object.
 			// 11. Set the [[Prototype]] internal property of F to the standard
 			//   built-in Function prototype object as specified in 15.3.3.1.
@@ -102,7 +209,7 @@ setTimeout(function(){
 
 					var result = target.apply(
 						this,
-						args.concat(_Array_slice_.call(arguments))
+						args.concat(array_slice.call(arguments))
 					);
 					if (Object(result) === result) {
 						return result;
@@ -131,7 +238,7 @@ setTimeout(function(){
 					// equiv: target.call(this, ...boundArgs, ...args)
 					return target.apply(
 						that,
-						args.concat(_Array_slice_.call(arguments))
+						args.concat(array_slice.call(arguments))
 					);
 
 				}
@@ -190,12 +297,12 @@ setTimeout(function(){
 
 			// 22. Return F.
 			return bound;
-		};
 		}
+	});
 
 // _Please note: Shortcuts are defined after `Function.prototype.bind` as we
 // us it in defining shortcuts.
-	var owns = call.bind(prototypeOfObject.hasOwnProperty);
+	var owns = call.bind(ObjectPrototype.hasOwnProperty);
 
 // If JS engine supports accessors creating shortcuts.
 	var defineGetter;
@@ -203,11 +310,11 @@ setTimeout(function(){
 	var lookupGetter;
 	var lookupSetter;
 	var supportsAccessors;
-	if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+	if ((supportsAccessors = owns(ObjectPrototype, "__defineGetter__"))) {
-		defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+		defineGetter = call.bind(ObjectPrototype.__defineGetter__);
-		defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+		defineSetter = call.bind(ObjectPrototype.__defineSetter__);
-		lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+		lookupGetter = call.bind(ObjectPrototype.__lookupGetter__);
-		lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+		lookupSetter = call.bind(ObjectPrototype.__lookupSetter__);
 	}
 
 //
@@ -217,56 +324,61 @@ setTimeout(function(){
 
 // ES5 15.4.4.12
 // http://es5.github.com/#x15.4.4.12
-	var spliceWorksWithEmptyObject = (function () {
-		var obj = {};
-		Array.prototype.splice.call(obj, 0, 0, 1);
-		return obj.length === 1;
-	}());
-	var omittingSecondSpliceArgIsNoop = [1].splice(0).length === 0;
 	var spliceNoopReturnsEmptyArray = (function () {
 		var a = [1, 2];
 		var result = a.splice();
 		return a.length === 2 && isArray(result) && result.length === 0;
 	}());
-	if (spliceNoopReturnsEmptyArray) {
+	defineProperties(ArrayPrototype, {
-		// Safari 5.0 bug where .split() returns undefined
+		// Safari 5.0 bug where .splice() returns undefined
-		Array.prototype.splice = function splice(start, deleteCount) {
+		splice: function splice(start, deleteCount) {
-			if (arguments.length === 0) { return []; }
+			if (arguments.length === 0) {
-			else { return array_splice.apply(this, arguments); }
+				return [];
-		};
+			} else {
+				return array_splice.apply(this, arguments);
 			}
-	if (!omittingSecondSpliceArgIsNoop || !spliceWorksWithEmptyObject) {
+		}
-		Array.prototype.splice = function splice(start, deleteCount) {
+	}, spliceNoopReturnsEmptyArray);
+
+	var spliceWorksWithEmptyObject = (function () {
+		var obj = {};
+		ArrayPrototype.splice.call(obj, 0, 0, 1);
+		return obj.length === 1;
+	}());
+	defineProperties(ArrayPrototype, {
+		splice: function splice(start, deleteCount) {
 			if (arguments.length === 0) { return []; }
 			var args = arguments;
 			this.length = Math.max(toInteger(this.length), 0);
 			if (arguments.length > 0 && typeof deleteCount !== 'number') {
-				args = _Array_slice_.call(arguments);
+				args = array_slice.call(arguments);
-				if (args.length < 2) { args.push(toInteger(deleteCount)); }
+				if (args.length < 2) {
-				else { args[1] = toInteger(deleteCount); }
+					args.push(this.length - start);
+				} else {
+					args[1] = toInteger(deleteCount);
+				}
 			}
 			return array_splice.apply(this, args);
-		};
 		}
+	}, !spliceWorksWithEmptyObject);
 
 // ES5 15.4.4.12
 // http://es5.github.com/#x15.4.4.13
 // Return len+argCount.
 // [bugfix, ielt8]
 // IE < 8 bug: [].unshift(0) === undefined but should be "1"
-	if ([].unshift(0) !== 1) {
+	var hasUnshiftReturnValueBug = [].unshift(0) !== 1;
-		Array.prototype.unshift = function () {
+	defineProperties(ArrayPrototype, {
+		unshift: function () {
 			array_unshift.apply(this, arguments);
 			return this.length;
-		};
 		}
+	}, hasUnshiftReturnValueBug);
 
 // ES5 15.4.3.2
 // http://es5.github.com/#x15.4.3.2
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-	if (!Array.isArray) {
+	defineProperties(Array, { isArray: isArray });
-		Array.isArray = isArray;
-	}
 
 // The IsCallable() check in the Array functions
 // has been replaced with a strict check on the
@@ -306,12 +418,10 @@ setTimeout(function(){
 		return !!method && properlyBoxesNonStrict && properlyBoxesStrict;
 	};
 
-	if (!Array.prototype.forEach || !properlyBoxesContext(Array.prototype.forEach)) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+		forEach: function forEach(fun /*, thisp*/) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				thisp = arguments[1],
 				i = -1,
 				length = self.length >>> 0;
@@ -329,18 +439,16 @@ setTimeout(function(){
 					fun.call(thisp, self[i], i, object);
 				}
 			}
-		};
 		}
+	}, !properlyBoxesContext(ArrayPrototype.forEach));
 
 // ES5 15.4.4.19
 // http://es5.github.com/#x15.4.4.19
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-	if (!Array.prototype.map || !properlyBoxesContext(Array.prototype.map)) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.map = function map(fun /*, thisp*/) {
+		map: function map(fun /*, thisp*/) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0,
 				result = Array(length),
 				thisp = arguments[1];
@@ -356,18 +464,16 @@ setTimeout(function(){
 				}
 			}
 			return result;
-		};
 		}
+	}, !properlyBoxesContext(ArrayPrototype.map));
 
 // ES5 15.4.4.20
 // http://es5.github.com/#x15.4.4.20
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-	if (!Array.prototype.filter || !properlyBoxesContext(Array.prototype.filter)) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.filter = function filter(fun /*, thisp */) {
+		filter: function filter(fun /*, thisp */) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0,
 				result = [],
 				value,
@@ -387,18 +493,16 @@ setTimeout(function(){
 				}
 			}
 			return result;
-		};
 		}
+	}, !properlyBoxesContext(ArrayPrototype.filter));
 
 // ES5 15.4.4.16
 // http://es5.github.com/#x15.4.4.16
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-	if (!Array.prototype.every || !properlyBoxesContext(Array.prototype.every)) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.every = function every(fun /*, thisp */) {
+		every: function every(fun /*, thisp */) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0,
 				thisp = arguments[1];
 
@@ -413,18 +517,16 @@ setTimeout(function(){
 				}
 			}
 			return true;
-		};
 		}
+	}, !properlyBoxesContext(ArrayPrototype.every));
 
 // ES5 15.4.4.17
 // http://es5.github.com/#x15.4.4.17
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-	if (!Array.prototype.some || !properlyBoxesContext(Array.prototype.some)) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.some = function some(fun /*, thisp */) {
+		some: function some(fun /*, thisp */) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0,
 				thisp = arguments[1];
 
@@ -439,22 +541,20 @@ setTimeout(function(){
 				}
 			}
 			return false;
-		};
 		}
+	}, !properlyBoxesContext(ArrayPrototype.some));
 
 // ES5 15.4.4.21
 // http://es5.github.com/#x15.4.4.21
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
 	var reduceCoercesToObject = false;
-	if (Array.prototype.reduce) {
+	if (ArrayPrototype.reduce) {
-		reduceCoercesToObject = typeof Array.prototype.reduce.call('es5', function (_, __, ___, list) { return list; }) === 'object';
+		reduceCoercesToObject = typeof ArrayPrototype.reduce.call('es5', function (_, __, ___, list) { return list; }) === 'object';
 	}
-	if (!Array.prototype.reduce || !reduceCoercesToObject) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.reduce = function reduce(fun /*, initial*/) {
+		reduce: function reduce(fun /*, initial*/) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0;
 
 			// If no callback function or if callback is not a callable function
@@ -492,22 +592,20 @@ setTimeout(function(){
 			}
 
 			return result;
-		};
 		}
+	}, !reduceCoercesToObject);
 
 // ES5 15.4.4.22
 // http://es5.github.com/#x15.4.4.22
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
 	var reduceRightCoercesToObject = false;
-	if (Array.prototype.reduceRight) {
+	if (ArrayPrototype.reduceRight) {
-		reduceRightCoercesToObject = typeof Array.prototype.reduceRight.call('es5', function (_, __, ___, list) { return list; }) === 'object';
+		reduceRightCoercesToObject = typeof ArrayPrototype.reduceRight.call('es5', function (_, __, ___, list) { return list; }) === 'object';
 	}
-	if (!Array.prototype.reduceRight || !reduceRightCoercesToObject) {
+	defineProperties(ArrayPrototype, {
-		Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+		reduceRight: function reduceRight(fun /*, initial*/) {
 			var object = toObject(this),
-				self = splitString && _toString.call(this) === "[object String]" ?
+				self = splitString && isString(this) ? this.split('') : object,
-					this.split("") :
-					object,
 				length = self.length >>> 0;
 
 			// If no callback function or if callback is not a callable function
@@ -548,17 +646,16 @@ setTimeout(function(){
 			} while (i--);
 
 			return result;
-		};
 		}
+	}, !reduceRightCoercesToObject);
 
 // ES5 15.4.4.14
 // http://es5.github.com/#x15.4.4.14
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-	if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) !== -1)) {
+	var hasFirefox2IndexOfBug = Array.prototype.indexOf && [0, 1].indexOf(1, 2) !== -1;
-		Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
+	defineProperties(ArrayPrototype, {
-			var self = splitString && _toString.call(this) === "[object String]" ?
+		indexOf: function indexOf(sought /*, fromIndex */ ) {
-					this.split("") :
+			var self = splitString && isString(this) ? this.split('') : toObject(this),
-					toObject(this),
 				length = self.length >>> 0;
 
 			if (!length) {
@@ -578,17 +675,16 @@ setTimeout(function(){
 				}
 			}
 			return -1;
-		};
 		}
+	}, hasFirefox2IndexOfBug);
 
 // ES5 15.4.4.15
 // http://es5.github.com/#x15.4.4.15
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-	if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) !== -1)) {
+	var hasFirefox2LastIndexOfBug = Array.prototype.lastIndexOf && [0, 1].lastIndexOf(0, -3) !== -1;
-		Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+	defineProperties(ArrayPrototype, {
-			var self = splitString && _toString.call(this) === "[object String]" ?
+		lastIndexOf: function lastIndexOf(sought /*, fromIndex */) {
-					this.split("") :
+			var self = splitString && isString(this) ? this.split('') : toObject(this),
-					toObject(this),
 				length = self.length >>> 0;
 
 			if (!length) {
@@ -606,8 +702,8 @@ setTimeout(function(){
 				}
 			}
 			return -1;
-		};
 		}
+	}, hasFirefox2LastIndexOfBug);
 
 //
 // Object
@@ -616,10 +712,7 @@ setTimeout(function(){
 
 // ES5 15.2.3.14
 // http://es5.github.com/#x15.2.3.14
-	var keysWorksWithArguments = Object.keys && (function () {
+
-		return Object.keys(arguments).length === 2;
-	}(1, 2));
-	if (!Object.keys) {
 // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
 	var hasDontEnumBug = !({'toString': null}).propertyIsEnumerable('toString'),
 		hasProtoEnumBug = (function () {}).propertyIsEnumerable('prototype'),
@@ -634,11 +727,12 @@ setTimeout(function(){
 		],
 		dontEnumsLength = dontEnums.length;
 
-		Object.keys = function keys(object) {
+	defineProperties(Object, {
+		keys: function keys(object) {
 			var isFn = isFunction(object),
 				isArgs = isArguments(object),
 				isObject = object !== null && typeof object === 'object',
-				isString = isObject && _toString.call(object) === '[object String]';
+				isStr = isObject && isString(object);
 
 			if (!isObject && !isFn && !isArgs) {
 				throw new TypeError("Object.keys called on a non-object");
@@ -646,7 +740,7 @@ setTimeout(function(){
 
 			var theKeys = [];
 			var skipProto = hasProtoEnumBug && isFn;
-			if (isString || isArgs) {
+			if (isStr || isArgs) {
 				for (var i = 0; i < object.length; ++i) {
 					theKeys.push(String(i));
 				}
@@ -669,18 +763,23 @@ setTimeout(function(){
 				}
 			}
 			return theKeys;
-		};
+		}
-	} else if (!keysWorksWithArguments) {
+	});
+
+	var keysWorksWithArguments = Object.keys && (function () {
 			// Safari 5.0 bug
+			return Object.keys(arguments).length === 2;
+		}(1, 2));
 	var originalKeys = Object.keys;
-		Object.keys = function keys(object) {
+	defineProperties(Object, {
+		keys: function keys(object) {
 			if (isArguments(object)) {
-				return originalKeys(Array.prototype.slice.call(object));
+				return originalKeys(ArrayPrototype.slice.call(object));
 			} else {
 				return originalKeys(object);
 			}
-		};
 		}
+	}, !keysWorksWithArguments);
 
 //
 // Date
@@ -694,13 +793,12 @@ setTimeout(function(){
 // string format defined in 15.9.1.15. All fields are present in the String.
 // The time zone is always UTC, denoted by the suffix Z. If the time value of
 // this object is not a finite Number a RangeError exception is thrown.
-	var negativeDate = -62198755200000,
+	var negativeDate = -62198755200000;
-		negativeYearString = "-000001";
+	var negativeYearString = "-000001";
-	if (
+	var hasNegativeDateBug = Date.prototype.toISOString && new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1;
-		!Date.prototype.toISOString ||
+
-			(new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1)
+	defineProperties(Date.prototype, {
-		) {
+		toISOString: function toISOString() {
-		Date.prototype.toISOString = function toISOString() {
 			var result, length, value, year, month;
 			if (!isFinite(this)) {
 				throw new RangeError("Date.prototype.toISOString called on non-finite value.");
@@ -735,8 +833,8 @@ setTimeout(function(){
 			"T" + result.slice(2).join(":") + "." +
 			("000" + this.getUTCMilliseconds()).slice(-3) + "Z"
 			);
-		};
 		}
+	}, hasNegativeDateBug);
 
 
 // ES5 15.9.5.44
@@ -960,39 +1058,39 @@ setTimeout(function(){
 
 // ES5.1 15.7.4.5
 // http://es5.github.com/#x15.7.4.5
-	if (!Number.prototype.toFixed || (0.00008).toFixed(3) !== '0.000' || (0.9).toFixed(0) === '0' || (1.255).toFixed(2) !== '1.25' || (1000000000000000128).toFixed(0) !== "1000000000000000128") {
+	var hasToFixedBugs = NumberPrototype.toFixed && (
-		// Hide these variables and functions
+		(0.00008).toFixed(3) !== '0.000'
-		(function () {
+		|| (0.9).toFixed(0) !== '1'
-			var base, size, data, i;
+		|| (1.255).toFixed(2) !== '1.25'
+		|| (1000000000000000128).toFixed(0) !== "1000000000000000128"
+		);
 
-			base = 1e7;
+	var toFixedHelpers = {
-			size = 6;
+		base: 1e7,
-			data = [0, 0, 0, 0, 0, 0];
+		size: 6,
-
+		data: [0, 0, 0, 0, 0, 0],
-			function multiply(n, c) {
+		multiply: function multiply(n, c) {
 			var i = -1;
-				while (++i < size) {
+			while (++i < toFixedHelpers.size) {
-					c += n * data[i];
+				c += n * toFixedHelpers.data[i];
-					data[i] = c % base;
+				toFixedHelpers.data[i] = c % toFixedHelpers.base;
-					c = Math.floor(c / base);
+				c = Math.floor(c / toFixedHelpers.base);
 			}
-			}
+		},
-
+		divide: function divide(n) {
-			function divide(n) {
+			var i = toFixedHelpers.size, c = 0;
-				var i = size, c = 0;
 			while (--i >= 0) {
-					c += data[i];
+				c += toFixedHelpers.data[i];
-					data[i] = Math.floor(c / n);
+				toFixedHelpers.data[i] = Math.floor(c / n);
-					c = (c % n) * base;
+				c = (c % n) * toFixedHelpers.base;
 			}
-			}
+		},
-
+		numToString: function numToString() {
-			function numToString() {
+			var i = toFixedHelpers.size;
-				var i = size;
 			var s = '';
 			while (--i >= 0) {
-					if (s !== '' || i === 0 || data[i] !== 0) {
+				if (s !== '' || i === 0 || toFixedHelpers.data[i] !== 0) {
-						var t = String(data[i]);
+					var t = String(toFixedHelpers.data[i]);
 					if (s === '') {
 						s = t;
 					} else {
@@ -1001,13 +1099,11 @@ setTimeout(function(){
 				}
 			}
 			return s;
-			}
+		},
-
+		pow: function pow(x, n, acc) {
-			function pow(x, n, acc) {
 			return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
-			}
+		},
-
+		log: function log(x) {
-			function log(x) {
 			var n = 0;
 			while (x >= 4096) {
 				n += 12;
@@ -1019,8 +1115,10 @@ setTimeout(function(){
 			}
 			return n;
 		}
+	};
 
-			Number.prototype.toFixed = function toFixed(fractionDigits) {
+	defineProperties(NumberPrototype, {
+		toFixed: function toFixed(fractionDigits) {
 			var f, x, s, m, e, z, j, k;
 
 			// Test for NaN and round fractionDigits down
@@ -1055,38 +1153,38 @@ setTimeout(function(){
 			if (x > 1e-21) {
 				// 1e-21 < x < 1e21
 				// -70 < log2(x) < 70
-					e = log(x * pow(2, 69, 1)) - 69;
+				e = toFixedHelpers.log(x * toFixedHelpers.pow(2, 69, 1)) - 69;
-					z = (e < 0 ? x * pow(2, -e, 1) : x / pow(2, e, 1));
+				z = (e < 0 ? x * toFixedHelpers.pow(2, -e, 1) : x / toFixedHelpers.pow(2, e, 1));
 				z *= 0x10000000000000; // Math.pow(2, 52);
 				e = 52 - e;
 
 				// -18 < e < 122
 				// x = z / 2 ^ e
 				if (e > 0) {
-						multiply(0, z);
+					toFixedHelpers.multiply(0, z);
 					j = f;
 
 					while (j >= 7) {
-							multiply(1e7, 0);
+						toFixedHelpers.multiply(1e7, 0);
 						j -= 7;
 					}
 
-						multiply(pow(10, j, 1), 0);
+					toFixedHelpers.multiply(toFixedHelpers.pow(10, j, 1), 0);
 					j = e - 1;
 
 					while (j >= 23) {
-							divide(1 << 23);
+						toFixedHelpers.divide(1 << 23);
 						j -= 23;
 					}
 
-						divide(1 << j);
+					toFixedHelpers.divide(1 << j);
-						multiply(1, 1);
+					toFixedHelpers.multiply(1, 1);
-						divide(2);
+					toFixedHelpers.divide(2);
-						m = numToString();
+					m = toFixedHelpers.numToString();
 				} else {
-						multiply(0, z);
+					toFixedHelpers.multiply(0, z);
-						multiply(1 << (-e), 0);
+					toFixedHelpers.multiply(1 << (-e), 0);
-						m = numToString() + '0.00000000000000000000'.slice(2, 2 + f);
+					m = toFixedHelpers.numToString() + '0.00000000000000000000'.slice(2, 2 + f);
 				}
 			}
 
@@ -1103,9 +1201,8 @@ setTimeout(function(){
 			}
 
 			return m;
-			};
-		}());
 		}
+	}, hasToFixedBugs);
 
 
 //
@@ -1128,7 +1225,7 @@ setTimeout(function(){
 //    ''.split(/.?/) should be [], not [""]
 //    '.'.split(/()()/) should be ["."], not ["", "", "."]
 
-	var string_split = String.prototype.split;
+	var string_split = StringPrototype.split;
 	if (
 		'ab'.split(/(?:ab)*/).length !== 2 ||
 		'.'.split(/(.?)(.?)/).length !== 4 ||
@@ -1140,7 +1237,7 @@ setTimeout(function(){
 		(function () {
 			var compliantExecNpcg = /()??/.exec("")[1] === void 0; // NPCG: nonparticipating capturing group
 
-			String.prototype.split = function (separator, limit) {
+			StringPrototype.split = function (separator, limit) {
 				var string = this;
 				if (separator === void 0 && limit === 0) {
 					return [];
@@ -1192,7 +1289,7 @@ setTimeout(function(){
 							});
 						}
 						if (match.length > 1 && match.index < string.length) {
-							Array.prototype.push.apply(output, match.slice(1));
+							ArrayPrototype.push.apply(output, match.slice(1));
 						}
 						lastLength = match[0].length;
 						lastLastIndex = lastIndex;
@@ -1222,13 +1319,13 @@ setTimeout(function(){
 // elements.
 // "0".split(undefined, 0) -> []
 	} else if ("0".split(void 0, 0).length) {
-		String.prototype.split = function split(separator, limit) {
+		StringPrototype.split = function split(separator, limit) {
 			if (separator === void 0 && limit === 0) { return []; }
 			return string_split.call(this, separator, limit);
 		};
 	}
 
-	var str_replace = String.prototype.replace;
+	var str_replace = StringPrototype.replace;
 	var replaceReportsGroupsCorrectly = (function () {
 		var groups = [];
 		'x'.replace(/x(.)?/g, function (match, group) {
@@ -1238,7 +1335,7 @@ setTimeout(function(){
 	}());
 
 	if (!replaceReportsGroupsCorrectly) {
-		String.prototype.replace = function replace(searchValue, replaceValue) {
+		StringPrototype.replace = function replace(searchValue, replaceValue) {
 			var isFn = isFunction(replaceValue);
 			var hasCapturingGroups = isRegex(searchValue) && (/\)[*?]/).test(searchValue.source);
 			if (!isFn || !hasCapturingGroups) {
@@ -1263,22 +1360,17 @@ setTimeout(function(){
 // non-normative section suggesting uniform semantics and it should be
 // normalized across all browsers
 // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
-	if ("".substr && "0b".substr(-1) !== "b") {
+	var string_substr = StringPrototype.substr;
-		var string_substr = String.prototype.substr;
+	var hasNegativeSubstrBug = "".substr && "0b".substr(-1) !== "b";
-		/**
+	defineProperties(StringPrototype, {
-		 * Get the substring of a string
+		substr: function substr(start, length) {
-		 * @param {integer} start where to start the substring
-		 * @param {integer} length how many characters to return
-		 * @return {string}
-		 */
-		String.prototype.substr = function substr(start, length) {
 			return string_substr.call(
 				this,
 				start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
 				length
 			);
-		};
 		}
+	}, hasNegativeSubstrBug);
 
 // ES5 15.5.4.20
 // whitespace from: http://es5.github.io/#x15.5.4.20
@@ -1286,21 +1378,20 @@ setTimeout(function(){
 		"\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
 		"\u2029\uFEFF";
 	var zeroWidth = '\u200b';
-	if (!String.prototype.trim || ws.trim() || !zeroWidth.trim()) {
+	var wsRegexChars = "[" + ws + "]";
+	var trimBeginRegexp = new RegExp("^" + wsRegexChars + wsRegexChars + "*");
+	var trimEndRegexp = new RegExp(wsRegexChars + wsRegexChars + "*$");
+	var hasTrimWhitespaceBug = StringPrototype.trim && (ws.trim() || !zeroWidth.trim());
+	defineProperties(StringPrototype, {
 		// http://blog.stevenlevithan.com/archives/faster-trim-javascript
 		// http://perfectionkills.com/whitespace-deviations/
-		ws = "[" + ws + "]";
+		trim: function trim() {
-		var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-			trimEndRegexp = new RegExp(ws + ws + "*$");
-		String.prototype.trim = function trim() {
 			if (this === void 0 || this === null) {
 				throw new TypeError("can't convert " + this + " to object");
 			}
-			return String(this)
+			return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-				.replace(trimBeginRegexp, "")
-				.replace(trimEndRegexp, "");
-		};
 		}
+	}, hasTrimWhitespaceBug);
 
 // ES-5 15.1.2.2
 	if (parseInt(ws + '08') !== 8 || parseInt(ws + '0x16') !== 22) {
@@ -1316,71 +1407,6 @@ setTimeout(function(){
 		}(parseInt));
 	}
 
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-
-	function toInteger(n) {
-		n = +n;
-		if (n !== n) { // isNaN
-			n = 0;
-		} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
-			n = (n > 0 || -1) * Math.floor(Math.abs(n));
-		}
-		return n;
-	}
-
-	function isPrimitive(input) {
-		var type = typeof input;
-		return (
-			input === null ||
-				type === "undefined" ||
-				type === "boolean" ||
-				type === "number" ||
-				type === "string"
-			);
-	}
-
-	function toPrimitive(input) {
-		var val, valueOf, toStr;
-		if (isPrimitive(input)) {
-			return input;
-		}
-		valueOf = input.valueOf;
-		if (isFunction(valueOf)) {
-			val = valueOf.call(input);
-			if (isPrimitive(val)) {
-				return val;
-			}
-		}
-		toStr = input.toString;
-		if (isFunction(toStr)) {
-			val = toStr.call(input);
-			if (isPrimitive(val)) {
-				return val;
-			}
-		}
-		throw new TypeError();
-	}
-
-// ES5 9.9
-// http://es5.github.com/#x9.9
-	var toObject = function (o) {
-		if (o == null) { // this matches both null and undefined
-			throw new TypeError("can't convert " + o + " to object");
-		}
-		return Object(o);
-	};
-
-	var ToUint32 = function ToUint32(x) {
-		return x >>> 0;
-	};
-
 })();
 
 

public/webshims/shims/filereader-xhr.js

@@ -380,11 +380,9 @@ webshim.register('filereader-xhr', function($, webshim, window, document, undefi
 						qualitiy = 0.8;
 					}
 					loadMoxie();
-					setTimeout(function(){
-						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 					webshim.ready('moxie', function(){
 						var img = new mOxie.Image();
-
+						dataURL = $canvas.callProp('getAsDataURL', [type, qualitiy]);
 						img.onload = function() {
 							var blob = img.getAsBlob();
 							webshim.defineProperty(blob, '_wsDataURL', {
@@ -395,7 +393,6 @@ webshim.register('filereader-xhr', function($, webshim, window, document, undefi
 						};
 						img.load(dataURL);
 					});
-					}, 9);
 				}
 			}
 		});

public/webshims/shims/form-core.js

@@ -257,6 +257,8 @@ webshims.register('form-core', function($, webshims, window, document, undefined
 		return message || '';
 	};
 
+	webshims.refreshCustomValidityRules = $.noop;
+	
 	$.fn.getErrorMessage = function(key){
 		var message = '';
 		var elem = this[0];

public/webshims/shims/form-number-date-ui.js

@@ -424,9 +424,13 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			},
 			time: function(val, o, noCorrect){
 				var fVal, i;
+
 				if(val){
 
 					val = val.split(':');
+					if(val.length != 2 || isNaN(parseInt(val[0] || '', 10)) || isNaN(parseInt(val[1] || '', 10))){
+						return val.join(':');
+					}
 					if(curCfg.meridian){
 						fVal = (val[0] * 1);
 						if(fVal && fVal >= 12){
@@ -581,6 +585,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				createFormat('d');
 				var tmp, obj;
 				var ret = '';
+
 				if(opts.splitInput){
 					obj = {yy: 0, mm: 1, dd: 2};
 				} else {
@@ -602,8 +607,7 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 					}
 					ret = ([addZero(val[obj.yy]), addZero(val[obj.mm]), addZero(val[obj.dd])]).join('-');
 				}
-				return ret
+				return ret;
-				;
 			},
 			color: function(val, opts){
 				var ret = '#000000';
@@ -905,9 +909,11 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 		};
 		
 		['defaultValue', 'value'].forEach(function(name){
+			var formatName = 'format'+name;
 			wsWidgetProto[name] = function(val, force){
-				if(!this._init || force || val !== this.options[name]){
+				if(!this._init || force || val !== this.options[name] || this.options[formatName] != this.element.prop(name)){
-					this.element.prop(name, this.formatValue(val));
+					this.options[formatName] = this.formatValue(val);
+					this.element.prop(name, this.options[formatName]);
 					this.options[name] = val;
 					this._propertyChange(name);
 					this.mirrorValidity();
@@ -1031,7 +1037,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 			var isValue = name == 'value';
 			spinBtnProto[name] = function(val, force, isLive){
 				var selectionEnd;
-				if(!this._init || force || this.options[name] !== val){
 				if(isValue){
 					this._beforeValue(val);
 				} else {
@@ -1060,7 +1065,6 @@ webshims.register('form-number-date-ui', function($, webshims, window, document,
 				}
 				this._propertyChange(name);
 				this.mirrorValidity();
-				}
 			};
 		});
 		

public/webshims/shims/form-shim-extend.js

@@ -607,21 +607,24 @@ if(webshims.support.inputtypes.date && /webkit/i.test(navigator.userAgent)){
 
 webshims.addReady(function(context, contextElem){
 	//start constrain-validation
-	var focusElem;
+
 	$('form', context)
 		.add(contextElem.filter('form'))
 		.on('invalid', $.noop)
 	;
 
+	setTimeout(function(){
+		var focusElem;
 		try {
-		if(context == document && !('form' in (document.activeElement || {}))) {
+			if(!('form' in (document.activeElement || {}))) {
 				focusElem = $(context.querySelector('input[autofocus], select[autofocus], textarea[autofocus]')).eq(0).getShadowFocusElement()[0];
-			if (focusElem && focusElem.offsetHeight && focusElem.offsetWidth) {
+				if (focusElem && (focusElem.offsetHeight || focusElem.offsetWidth)) {
 					focusElem.focus();
 				}
 			}
 		}
 		catch (er) {}
+	}, 9);
 
 });
 

public/webshims/shims/form-validation.js

@@ -117,7 +117,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 				){
 					return;
 			}
-			if(webshims.refreshCustomValidityRules && webshims.refreshCustomValidityRules(elem) == 'async'){
+			if(webshims.refreshCustomValidityRules(elem) == 'async'){
 				$(elem).one('updatevalidation.webshims', switchValidityClass);
 				return;
 			}
@@ -423,7 +423,7 @@ webshims.register('form-validation', function($, webshims, window, document, und
 					if(!appendElement && !invalidParent.test(parent.nodeName)){
 						appendElement = parent;
 					}
-					if(appendElement && $.css(parent, 'overflow') == 'hidden' && $.css(parent, 'position') != 'static'){
+					if(appendElement && $.css(parent, 'overflow') != 'visible' && $.css(parent, 'position') != 'static'){
 						appendElement = false;
 					}
 				}

public/webshims/shims/form-validators.js

@@ -7,10 +7,6 @@ webshims.ready('form-validation', function(){
 });
 
 (function(){
-	if(webshims.refreshCustomValidityRules){
-		webshims.error("form-validators already included. please remove custom-validity.js");
-	}
-
 	var customValidityRules = {};
 	var formReady = false;
 	var blockCustom;
@@ -341,8 +337,6 @@ webshims.ready('form-validation', function(){
 				val = $.inArray(val, data.specialVal) !== -1;
 			} if(data.toggle){
 				val = !val;
-			} else {
-				val = !!val;
 			}
 			$.prop( elem, data.prop, val);
 			if(iValClasses && e){

public/webshims/shims/forms-picker.js

@@ -1188,12 +1188,12 @@ webshims.register('forms-picker', function($, webshims, window, document, undefi
 			
 			str.push('<th class="week-header ws-week">'+ dateCfg.weekHeader +'</th>');
 			
-			for(k = dateCfg.firstDay; k < dateCfg.dayNamesShort.length; k++){
+			for(k = dateCfg.firstDay; k < dateCfg.dayNamesMin.length; k++){
-				str.push('<th class="day-'+ k +'"><abbr title="'+ dateCfg.dayNames[k] +'">'+ dateCfg.dayNamesShort[k] +'</abbr></th>');
+				str.push('<th class="day-'+ k +'"><abbr title="'+ dateCfg.dayNames[k] +'">'+ dateCfg.dayNamesMin[k] +'</abbr></th>');
 			}
 			k = dateCfg.firstDay;
 			while(k--){
-				str.push('<th class="day-'+ k +'"><abbr title="'+ dateCfg.dayNames[k] +'">'+ dateCfg.dayNamesShort[k] +'</abbr></th>');
+				str.push('<th class="day-'+ k +'"><abbr title="'+ dateCfg.dayNames[k] +'">'+ dateCfg.dayNamesMin[k] +'</abbr></th>');
 			}
 			str.push('</tr></thead><tbody><tr class="ws-row-0">');
 			

public/webshims/shims/i18n/formcfg-ca.js

@@ -0,0 +1,65 @@
+webshims.validityMessages.es = {
+	"typeMismatch": {
+		"email": "Si us plau, introduïu una adreça de correu.",
+		"url": "Si us plau, introduïu un URL."
+	},
+	"badInput": {
+		"number": "Valor no válid",
+		"date": "Valor no válid",
+		"time": "Valor no válid",
+		"range": "Valor no válid",
+		"datetime-local": "Valor no válid"
+	},
+	"tooLong": "Valor no válid",
+	"patternMismatch": "Si us plau, ajusteu-vos al format sol·licitat: {%title}.",
+	"valueMissing": {
+		"defaultMessage": "Si us plau, ompliu aquest camp.",
+		"checkbox": "Si us plau, marqueu aquesta casella si voleu continuar.",
+		"select": "Si us plau, seleccioneu un element de la llista.",
+		"radio": "Si us plau, seleccioneu una de les opcions."
+	},
+	"rangeUnderflow": {
+		"defaultMessage": "El valor ha de superior o igual a {%min}.",
+		"date": "El valor ha de superior o igual a {%min}.",
+		"time": "El valor ha de superior o igual a {%min}.",
+		"datetime-local": "El valor ha de superior o igual a {%min}."
+	},
+	"rangeOverflow": {
+		"defaultMessage": "El valor ha de inferior o igual a {%max}.",
+		"date": "El valor ha de inferior o igual a {%max}.",
+		"time": "El valor ha de inferior o igual a {%max}.",
+		"datetime-local": "El valor ha de inferior o igual a {%max}."
+	},
+	"stepMismatch": "Valor no válid"
+};
+webshims.formcfg.es = {
+	numberFormat: {
+		".": ".",
+		",": ","
+	},
+	numberSigns: '.',
+	dateSigns: '/',
+	timeSigns: ":. ",
+	dFormat: "/",
+	patterns: {
+		d:  'dd/mm/yy'
+	},
+	date: {
+		closeText: 'Tanca',
+		prevText: '<Ant',
+		nextText: 'Seg>',
+		currentText: 'Avui',
+		monthNames: ['gener','gebrer','març','abril','maig','juny',
+		'juliol','agost','setembre','octubre','novembre','desembre'],
+		monthNamesShort: ['gen','febr','març','abr','maig','juny',
+		'jul','ag','set','oct','nov','des'],
+		dayNames: ['diumenge','dilluns','dimarts','dimecres','dijous','divendres','dissabte'],
+		dayNamesShort: ['dg','dl','dt','dc','dj','dv','ds'],
+		dayNamesMin: ['dg','dl','dt','dc','dj','dv','ds'],
+		weekHeader: 'St',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''
+	}
+};

public/webshims/shims/i18n/formcfg-ru.js

@@ -44,8 +44,15 @@ webshims.formcfg.ru = {
 	patterns: {
 		d: 'dd.mm.yy'
 	},
+	month: {
+		currentText: 'Текущий месяц'
+	},
+	time: {
+		currentText: 'Сейчас'
+	},
 	date: {
 		closeText: 'Закрыть',
+		clear: 'Очистить',
 		prevText: '<Пред',
 		nextText: 'След>',
 		currentText: 'Сегодня',
@@ -53,7 +60,7 @@ webshims.formcfg.ru = {
 		'Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь'],
 		monthNamesShort: ['Янв','Фев','Мар','Апр','Май','Июн',
 		'Июл','Авг','Сен','Окт','Ноя','Дек'],
-		dayNames: ['воскресенье','понедельник','вторник','среда','четверг','пятница','суббота'],
+		dayNames: ['Воскресенье','Понедельник','Вторник','Среда','Четверг','Пятница','Суббота'],
 		dayNamesShort: ['вск','пнд','втр','срд','чтв','птн','сбт'],
 		dayNamesMin: ['Вс','Пн','Вт','Ср','Чт','Пт','Сб'],
 		weekHeader: 'Нед',

public/webshims/shims/jme/controls.css

@@ -103,7 +103,6 @@
   0% {
     -webkit-transform: rotate(0deg);
   }
-
   100% {
     -webkit-transform: rotate(360deg);
   }
@@ -113,7 +112,6 @@
     -webkit-transform: rotate(0deg);
     transform: rotate(0deg);
   }
-
   100% {
     -webkit-transform: rotate(360deg);
     transform: rotate(360deg);
@@ -468,7 +466,7 @@
 .mediaplayer .mediamenu > div > .media-submenu {
   margin: 0.3125em 0;
   padding: 0.3125em 0;
-  border-top: 0.0625em solid #eeeeee;
+  border-top: 0.0625em solid #eee;
   border-top: 0.0625em solid rgba(255, 255, 255, 0.4);
 }
 .mediaplayer .mediamenu > div > .media-submenu:first-child {

public/webshims/shims/mediacapture.js

@@ -81,6 +81,7 @@ webshim.register('mediacapture', function($, webshim, window, document, undefine
 			resolve();
 		}
 	})();
+	var regImage = /image\/\*|image\/jp/i;
 	var loadPicker = function(){
 		webshim.ready('WINDOWLOAD', function(){
 			webshim.loader.loadList(['mediacapture-picker']);
@@ -91,10 +92,15 @@ webshim.register('mediacapture', function($, webshim, window, document, undefine
 
 	var _createPhotoPicker = function(){
 		if($(this).is('[capture].ws-filereader, .ws-capture') && webshim.implement(this, 'capture')){
-			var $wrapper, $customFile;
+			var $wrapper, $customFile, $button, popover;
 			var $fileinput = $(this);
-			var $button = $('<button type="button" class="ws-capture-button">photo</button>');
+			var accept = $fileinput.prop('accept') || 'image/*';
-			var popover = webshim.objectCreate(webshim.wsPopover, {}, $.extend({prepareFor: $button}));
+
+			if(!regImage.test(accept)){return;}
+
+			$button = $('<button type="button" class="ws-capture-button" />');
+			popover = webshim.objectCreate(webshim.wsPopover, {}, $.extend({prepareFor: $button}));
+
 			popover.element.addClass('capture-popover input-picker');
 
 			if($fileinput.is('.ws-custom-file > *')){

public/webshims/shims/mediaelement-jaris.js

@@ -1137,6 +1137,25 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			VIDEO: 1
 		};
 		var tested = {};
+		var addToBlob = function(){
+			var desc = webshim.defineNodeNameProperty('canvas', 'toBlob', {
+				prop: {
+					value: function(){
+						var context = $(this).callProp('getContext', ['2d']);
+						var that = this;
+						var args = arguments;
+						var cb = function(){
+							return desc.prop._supvalue.apply(that, args);
+						};
+						if(context.wsImageComplete && context._wsIsLoading){
+							context.wsImageComplete(cb);
+						} else {
+							return cb();
+						}
+					}
+				}
+			});
+		};
 
 		if(!_drawImage){
 			webshim.error('canvas.drawImage feature is needed. In IE8 flashvanvas pro can be used');
@@ -1211,6 +1230,12 @@ webshims.register('mediaelement-jaris', function($, webshims, window, document,
 			}
 			return _drawImage.apply(this, arguments);
 		};
+
+		if(!document.createElement('canvas').toBlob){
+			webshims.ready('filereader', addToBlob);
+		} else {
+			addToBlob();
+		}
 		return true;
 	};
 

public/webshims/shims/picture.js

@@ -1,568 +1,429 @@
-webshim.ready('matchMedia', function($, webshim, w, doc, undefined){
+/*! respimage - v0.9.5 - 2014-10-22
-	try {
+ Licensed MIT */
-		new Image();
+!function(window, document, undefined) {
-	} catch(e){
-		window.Image = function(){
-			return document.createElement('img');
-		};
-	}
-	webshim.isReady('picture', true);
-// Enable strict mode
 	"use strict";
-
+	function trim(str) {
-	// If picture is supported, well, that's awesome. Let's get outta here...
-	if ( w.HTMLPictureElement ) {
-		w.picturefill = function() { };
-		return;
-	}
-
-	// HTML shim|v it for old IE (IE9 will still need the HTML video tag workaround)
-	doc.createElement( "picture" );
-
-	// local object for method references and testing exposure
-	var pf = {};
-
-	// namespace
-	pf.ns = "picturefill";
-
-	// srcset support test
-	pf.srcsetSupported = "srcset" in doc.createElement( "img" );
-	pf.sizesSupported = w.HTMLImageElement.sizes;
-
-	// just a string trim workaround
-	pf.trim = function( str ) {
 		return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, "");
-	};
-
-	// just a string endsWith workaround
-	pf.endsWith = function( str, suffix ) {
-		return str.endsWith ? str.endsWith( suffix ) : str.indexOf( suffix, str.length - suffix.length ) !== -1;
-	};
-
-	/**
-	 * Shortcut method for matchMedia ( for easy overriding in tests )
-	 */
-	pf.matchesMedia = function( media ) {
-		return w.matchMedia && w.matchMedia( media ).matches;
-	};
-
-	/**
-	 * Shortcut method for `devicePixelRatio` ( for easy overriding in tests )
-	 */
-	pf.getDpr = function() {
-		return ( w.devicePixelRatio || 1 );
-	};
-
-	/**
-	 * Get width in css pixel value from a "length" value
-	 * http://dev.w3.org/csswg/css-values-3/#length-value
-	 */
-	pf.getWidthFromLength = function( length ) {
-		// If no length was specified, or it is 0 or negative, default to `100vw` (per the spec).
-		length = length && ( parseFloat( length ) > 0 || length.indexOf( "calc(" ) > -1 ) ? length : "100vw";
-
-		/**
-		 * If length is specified in  `vw` units, use `%` instead since the div we’re measuring
-		 * is injected at the top of the document.
-		 *
-		 * TODO: maybe we should put this behind a feature test for `vw`?
-		 */
-		length = length.replace( "vw", "%" );
-
-		// Create a cached element for getting length value widths
-		if ( !pf.lengthEl ) {
-			pf.lengthEl = doc.createElement( "div" );
-			doc.documentElement.insertBefore( pf.lengthEl, doc.documentElement.firstChild );
 	}
-
+	function updateView() {
-		// Positioning styles help prevent padding/margin/width on `html` from throwing calculations off.
+		isVwDirty = !1, ri.vW = window.innerWidth || Math.max(docElem.offsetWidth || 0, docElem.clientWidth || 0),
-		pf.lengthEl.style.cssText = "position: absolute; left: 0; width: " + length + ";";
+			vH = window.innerHeight || Math.max(docElem.offsetHeight || 0, docElem.clientHeight || 0);
-
-		if ( pf.lengthEl.offsetWidth <= 0 ) {
-			// Something has gone wrong. `calc()` is in use and unsupported, most likely. Default to `100vw` (`100%`, for broader support.):
-			pf.lengthEl.style.cssText = "width: 100%;";
 	}
-
+	function parseDescriptor(descriptor) {
-		return pf.lengthEl.offsetWidth;
+		if (!(descriptor in memDescriptor)) {
-	};
+			var descriptorObj = {
-
+				val: 1,
-	// container of supported mime types that one might need to qualify before using
+				type: "x"
-	pf.types =  {};
+			}, parsedDescriptor = trim(descriptor || "");
-
+			parsedDescriptor && (parsedDescriptor.match(regDescriptor) ? (descriptorObj.val = 1 * RegExp.$1,
-	// Add support for standard mime types.
+				descriptorObj.type = RegExp.$2) : descriptorObj = !1), memDescriptor[descriptor] = descriptorObj;
-	pf.types["image/jpeg"] = true;
-	pf.types["image/gif"] = true;
-	pf.types["image/png"] = true;
-
-	// test svg support
-	pf.types[ "image/svg+xml" ] = doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image", "1.1");
-
-	// test webp support, only when the markup calls for it
-	pf.types[ "image/webp" ] = function() {
-		// based on Modernizr's lossless img-webp test
-		// note: asynchronous
-		var img = new w.Image(),
-			type = "image/webp";
-
-		img.onerror = function() {
-			pf.types[ type ] = false;
-			picturefill();
-		};
-		img.onload = function() {
-			pf.types[ type ] = img.width === 1;
-			picturefill();
-		};
-		img.src = "data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=";
-	};
-
-	/**
-	 * Takes a source element and checks if its type attribute is present and if so, supported
-	 * Note: for type tests that require a async logic,
-	 * you can define them as a function that'll run only if that type needs to be tested. Just make the test function call picturefill again when it is complete.
-	 * see the async webp test above for example
-	 */
-	pf.verifyTypeSupport = function( source ) {
-		var type = source.getAttribute( "type" );
-		// if type attribute exists, return test result, otherwise return true
-		if ( type === null || type === "" ) {
-			return true;
-		} else {
-			// if the type test is a function, run it and return "pending" status. The function will rerun picturefill on pending elements once finished.
-			if ( typeof( pf.types[ type ] ) === "function" ) {
-				pf.types[ type ]();
-				return "pending";
-			} else {
-				return pf.types[ type ];
 		}
+		return memDescriptor[descriptor];
 	}
+	function chooseLowRes(lowRes, diff, dpr) {
+		return lowRes / dpr > .2 && (lowRes += diff * greed, diff > tHigh && (lowRes += tLow)),
+		lowRes > dpr;
+	}
+	function inView(el) {
+		if (!el.getBoundingClientRect) return !0;
+		var bottom, right, left, top, rect = el.getBoundingClientRect();
+		return !!((bottom = rect.bottom) >= -9 && (top = rect.top) <= vH + 9 && (right = rect.right) >= -9 && (left = rect.left) <= ri.vW + 9 && (bottom || right || left || top));
+	}
+	function applyBestCandidate(img) {
+		var srcSetCandidates, matchingSet = ri.getSet(img), evaluated = !1;
+		"pending" != matchingSet && (evaluated = !0, matchingSet && (srcSetCandidates = ri.setRes(matchingSet),
+			evaluated = ri.applySetCandidate(srcSetCandidates, img))), img[ri.ns].evaled = evaluated;
+	}
+	function ascendingSort(a, b) {
+		return a.res - b.res;
+	}
+	function setSrcToCur(img, src, set) {
+		var candidate;
+		return !set && src && (set = img[ri.ns].sets, set = set && set[set.length - 1]),
+			candidate = getCandidateForSrc(src, set), candidate && (src = ri.makeUrl(src), img[ri.ns].curSrc = src,
+			img[ri.ns].curCan = candidate, currentSrcSupported || (img.currentSrc = src), candidate.res || setResolution(candidate, candidate.set.sizes)),
+			candidate;
+	}
+	function getCandidateForSrc(src, set) {
+		var i, candidate, candidates;
+		if (src && set) for (candidates = ri.parseSet(set), src = ri.makeUrl(src), i = 0; i < candidates.length; i++) if (src == ri.makeUrl(candidates[i].url)) {
+			candidate = candidates[i];
+			break;
+		}
+		return candidate;
+	}
+	function hasOneX(set) {
+		var i, ret, candidates, desc;
+		if (set) for (candidates = ri.parseSet(set), i = 0; i < candidates.length; i++) if (desc = candidates[i].desc,
+			"x" == desc.type && 1 == desc.val) {
+			ret = !0;
+			break;
+		}
+		return ret;
+	}
+	function hasWDescripor(set) {
+		if (!set) return !1;
+		var candidates = ri.parseSet(set);
+		return candidates[0] && "w" == candidates[0].desc.type;
+	}
+	function getAllSourceElements(picture, candidates) {
+		var i, len, source, srcset, sources = picture.getElementsByTagName("source");
+		for (i = 0, len = sources.length; len > i; i++) source = sources[i], source[ri.ns] = !0,
+			srcset = source.getAttribute("srcset"), srcset && candidates.push({
+			srcset: srcset,
+			media: source.getAttribute("media"),
+			type: source.getAttribute("type"),
+			sizes: source.getAttribute("sizes")
+		});
+	}
+	function setResolution(candidate, sizesattr) {
+		var descriptor = candidate.desc;
+		return "w" == descriptor.type ? (candidate.cWidth = ri.calcListLength(sizesattr || "100vw"),
+			candidate.res = descriptor.val / candidate.cWidth) : candidate.res = descriptor.val,
+			candidate;
+	}
+	document.createElement("picture");
+	var lengthElInstered, lengthEl, currentSrcSupported, curSrcProp, ri = {}, noop = function() {}, image = document.createElement("img"), getImgAttr = image.getAttribute, setImgAttr = image.setAttribute, removeImgAttr = image.removeAttribute, docElem = document.documentElement, types = {}, cfg = {
+		addSize: !1,
+		xQuant: 1,
+		tLow: .1,
+		tHigh: .5,
+		tLazy: .1,
+		greed: .32
+	}, srcAttr = "data-risrc", srcsetAttr = srcAttr + "set";
+	ri.ns = ("ri" + new Date().getTime()).substr(0, 9), currentSrcSupported = "currentSrc" in image,
+		curSrcProp = currentSrcSupported ? "currentSrc" : "src", ri.supSrcset = "srcset" in image,
+		ri.supSizes = "sizes" in image, ri.selShort = "picture > img, img[srcset]", ri.sel = ri.selShort,
+		ri.cfg = cfg, ri.supSrcset && (ri.sel += ", img[" + srcsetAttr + "]");
+	var anchor = document.createElement("a");
+	ri.makeUrl = function(src) {
+		return anchor.href = src, anchor.href;
+	}, ri.qsa = function(context, sel) {
+		return context.querySelectorAll(sel);
 	};
-
+	{
-	/**
+		var on = (window.console && "function" == typeof console.warn ? function(message) {
-	 * Parses an individual `size` and returns the length, and optional media query
+			console.warn(message);
-	 */
+		} : noop, function(obj, evt, fn, capture) {
-	pf.parseSize = function( sourceSizeStr ) {
+			obj.addEventListener ? obj.addEventListener(evt, fn, capture || !1) : obj.attachEvent && obj.attachEvent("on" + evt, fn);
-		var match = /(\([^)]+\))?\s*(.+)/g.exec( sourceSizeStr );
+		}), off = function(obj, evt, fn, capture) {
-		return {
+			obj.removeEventListener ? obj.removeEventListener(evt, fn, capture || !1) : obj.detachEvent && obj.detachEvent("on" + evt, fn);
+		};
+		"https:" == location.protocol;
+	}
+	ri.matchesMedia = function() {
+		return ri.matchesMedia = window.matchMedia && (matchMedia("(min-width: 0.1em)") || {}).matches ? function(media) {
+			return !media || matchMedia(media).matches;
+		} : ri.mMQ, ri.matchesMedia.apply(this, arguments);
+	}, ri.vW = 0;
+	var vH, isVwDirty = !0, regex = {
+		minw: /\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,
+		maxw: /\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/
+	}, mediaCache = {};
+	ri.mMQ = function(media) {
+		var min, max, ret = !1;
+		return media ? (mediaCache[media] || (min = media.match(regex.minw) && parseFloat(RegExp.$1) + (RegExp.$2 || ""),
+			max = media.match(regex.maxw) && parseFloat(RegExp.$1) + (RegExp.$2 || ""), min && (min = parseFloat(min, 10) * (min.indexOf("em") > 0 ? ri.getEmValue() : 1)),
+		max && (max = parseFloat(max, 10) * (max.indexOf("em") > 0 ? ri.getEmValue() : 1)),
+			mediaCache[media] = {
+				min: min,
+				max: max
+			}), min = mediaCache[media].min, max = mediaCache[media].max, (min && ri.vW >= min || max && ri.vW <= max) && (ret = !0),
+			ret) : !0;
+	}, ri.DPR = window.devicePixelRatio || 1;
+	var lengthCache = {}, regLength = /^([\d\.]+)(em|vw|px)$/, baseStyle = "position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;";
+	ri.calcLength = function(sourceSizeValue) {
+		var failed, parsedLength, orirgValue = sourceSizeValue, value = !1;
+		if (!(orirgValue in lengthCache)) {
+			if (parsedLength = sourceSizeValue.match(regLength)) parsedLength[1] = parseFloat(parsedLength[1], 10),
+				value = parsedLength[1] ? "vw" == parsedLength[2] ? ri.vW * parsedLength[1] / 100 : "em" == parsedLength[2] ? ri.getEmValue() * parsedLength[1] : parsedLength[1] : !1; else if (sourceSizeValue.indexOf("calc") > -1 || parseInt(sourceSizeValue, 10)) {
+				sourceSizeValue = sourceSizeValue.replace("vw", "%"), lengthEl || (lengthEl = document.createElement("div"),
+					lengthEl.style.cssText = baseStyle), lengthElInstered || (lengthElInstered = !0,
+					docElem.insertBefore(lengthEl, docElem.firstChild)), lengthEl.style.width = "0px";
+				try {
+					lengthEl.style.width = sourceSizeValue;
+				} catch (e) {
+					failed = !0;
+				}
+				value = lengthEl.offsetWidth, failed && (value = !1);
+			}
+			0 >= value && (value = !1), lengthCache[orirgValue] = value;
+		}
+		return lengthCache[orirgValue];
+	}, ri.types = types, types["image/jpeg"] = !0, types["image/gif"] = !0, types["image/png"] = !0,
+		types["image/svg+xml"] = document.implementation.hasFeature("http://wwwindow.w3.org/TR/SVG11/feature#Image", "1.1"),
+		ri.supportsType = function(type) {
+			return type ? types[type] : !0;
+		};
+	var regSize = /(\([^)]+\))?\s*(.+)/, memSize = {};
+	ri.parseSize = function(sourceSizeStr) {
+		var match;
+		return memSize[sourceSizeStr] || (match = (sourceSizeStr || "").match(regSize),
+			memSize[sourceSizeStr] = {
 				media: match && match[1],
 				length: match && match[2]
-		};
+			}), memSize[sourceSizeStr];
-	};
+	}, ri.parseSet = function(set) {
-
+		if (!set.cands) {
-	/**
+			var pos, url, descriptor, last, descpos, srcset = set.srcset;
-	 * Takes a string of sizes and returns the width in pixels as a number
+			for (set.cands = []; srcset; ) srcset = srcset.replace(/^\s+/g, ""), pos = srcset.search(/\s/g),
-	 */
+				descriptor = null, -1 != pos ? (url = srcset.slice(0, pos), last = url.charAt(url.length - 1),
-	pf.findWidthFromSourceSize = function( sourceSizeListStr ) {
+			"," != last && url || (url = url.replace(/,+$/, ""), descriptor = ""), srcset = srcset.slice(pos + 1),
-		// Split up source size list, ie ( max-width: 30em ) 100%, ( max-width: 50em ) 50%, 33%
+			null == descriptor && (descpos = srcset.indexOf(","), -1 != descpos ? (descriptor = srcset.slice(0, descpos),
-		//                            or (min-width:30em) calc(30% - 15px)
+				srcset = srcset.slice(descpos + 1)) : (descriptor = srcset, srcset = ""))) : (url = srcset,
-		var sourceSizeList = pf.trim( sourceSizeListStr ).split( /\s*,\s*/ ),
+				srcset = ""), url && (descriptor = parseDescriptor(descriptor)) && set.cands.push({
-			winningLength;
+				url: url.replace(/^,+/, ""),
-
+				desc: descriptor,
-		for ( var i = 0, len = sourceSizeList.length; i < len; i++ ) {
+				set: set
-			// Match <media-condition>? length, ie ( min-width: 50em ) 100%
-			var sourceSize = sourceSizeList[ i ],
-			// Split "( min-width: 50em ) 100%" into separate strings
-				parsedSize = pf.parseSize( sourceSize ),
-				length = parsedSize.length,
-				media = parsedSize.media;
-
-			if ( !length ) {
-				continue;
-			}
-			if ( !media || pf.matchesMedia( media ) ) {
-				// if there is no media query or it matches, choose this as our winning length
-				// and end algorithm
-				winningLength = length;
-				break;
-			}
-		}
-
-		// pass the length to a method that can properly determine length
-		// in pixels based on these formats: http://dev.w3.org/csswg/css-values-3/#length-value
-		return pf.getWidthFromLength( winningLength );
-	};
-
-	pf.parseSrcset = function( srcset ) {
-		/**
-		 * A lot of this was pulled from Boris Smus’ parser for the now-defunct WHATWG `srcset`
-		 * https://github.com/borismus/srcset-polyfill/blob/master/js/srcset-info.js
-		 *
-		 * 1. Let input (`srcset`) be the value passed to this algorithm.
-		 * 2. Let position be a pointer into input, initially pointing at the start of the string.
-		 * 3. Let raw candidates be an initially empty ordered list of URLs with associated
-		 *    unparsed descriptors. The order of entries in the list is the order in which entries
-		 *    are added to the list.
-		 */
-		var candidates = [];
-
-		while ( srcset !== "" ) {
-			srcset = srcset.replace(/^\s+/g,"");
-
-			// 5. Collect a sequence of characters that are not space characters, and let that be url.
-			var pos = srcset.search(/\s/g),
-				url, descriptor = null;
-
-			if ( pos !== -1 ) {
-				url = srcset.slice( 0, pos );
-
-				var last = url[ url.length - 1 ];
-
-				// 6. If url ends with a U+002C COMMA character (,), remove that character from url
-				// and let descriptors be the empty string. Otherwise, follow these substeps
-				// 6.1. If url is empty, then jump to the step labeled descriptor parser.
-
-				if ( last === "," || url === "" ) {
-					url = url.replace(/,+$/, "");
-					descriptor = "";
-				}
-				srcset = srcset.slice( pos + 1 );
-
-				// 6.2. Collect a sequence of characters that are not U+002C COMMA characters (,), and
-				// let that be descriptors.
-				if ( descriptor === null ) {
-					var descpos = srcset.indexOf(",");
-					if ( descpos !== -1 ) {
-						descriptor = srcset.slice( 0, descpos );
-						srcset = srcset.slice( descpos + 1 );
-					} else {
-						descriptor = srcset;
-						srcset = "";
-					}
-				}
-			} else {
-				url = srcset;
-				srcset = "";
-			}
-
-			// 7. Add url to raw candidates, associated with descriptors.
-			if ( url || descriptor ) {
-				candidates.push({
-					url: url,
-					descriptor: descriptor
 			});
 		}
+		return set.cands;
+	};
+	var eminpx, memDescriptor = {}, regDescriptor = /^([\+eE\d\.]+)(w|x)$/, fsCss = "font-size:100% !important;";
+	ri.getEmValue = function() {
+		var body;
+		if (!eminpx && (body = document.body)) {
+			var div = document.createElement("div"), originalHTMLCSS = docElem.style.cssText, originalBodyCSS = body.style.cssText;
+			div.style.cssText = baseStyle, docElem.style.cssText = fsCss, body.style.cssText = fsCss,
+				body.appendChild(div), eminpx = div.offsetWidth, body.removeChild(div), eminpx = parseFloat(eminpx, 10),
+				docElem.style.cssText = originalHTMLCSS, body.style.cssText = originalBodyCSS;
+		}
+		return eminpx || 16;
+	};
+	var sizeLengthCache = {};
+	ri.calcListLength = function(sourceSizeListStr) {
+		if (!(sourceSizeListStr in sizeLengthCache) || cfg.uT) {
+			var sourceSize, parsedSize, length, media, i, len, sourceSizeList = trim(sourceSizeListStr).split(/\s*,\s*/), winningLength = !1;
+			for (i = 0, len = sourceSizeList.length; len > i && (sourceSize = sourceSizeList[i],
+				parsedSize = ri.parseSize(sourceSize), length = parsedSize.length, media = parsedSize.media,
+			!length || !ri.matchesMedia(media) || (winningLength = ri.calcLength(length)) === !1); i++) ;
+			sizeLengthCache[sourceSizeListStr] = winningLength ? winningLength : ri.vW;
+		}
+		return sizeLengthCache[sourceSizeListStr];
+	}, ri.setRes = function(set) {
+		var candidates, candidate;
+		if (set) {
+			candidates = ri.parseSet(set);
+			for (var i = 0, len = candidates.length; len > i; i++) candidate = candidates[i],
+			candidate.descriptor || setResolution(candidate, set.sizes);
 		}
 		return candidates;
 	};
-
+	var dprM, tLow, greed, tLazy, tHigh, tMemory, isWinComplete;
-	pf.parseDescriptor = function( descriptor, sizesattr ) {
+	ri.applySetCandidate = function(candidates, img) {
-		// 11. Descriptor parser: Let candidates be an initially empty source set. The order of entries in the list
+		if (candidates.length) {
-		// is the order in which entries are added to the list.
+			var candidate, dpr, i, j, diff, length, bestCandidate, curSrc, curCan, isSameSet, candidateSrc, imageData = img[ri.ns], evaled = !0;
-		var sizes = sizesattr || "100vw",
+			if (curSrc = imageData.curSrc || img[curSrcProp], curCan = imageData.curCan || setSrcToCur(img, curSrc, candidates[0].set),
-			sizeDescriptor = descriptor && descriptor.replace(/(^\s+|\s+$)/g, ""),
+					dpr = ri.getX(candidates, curCan), curSrc && (curCan && (curCan.res += tLazy), isSameSet = !imageData.pic || curCan && curCan.set == candidates[0].set,
-			widthInCssPixels = pf.findWidthFromSourceSize( sizes ),
+					curCan && isSameSet && curCan.res >= dpr && tMemory > curCan.res - dpr ? bestCandidate = curCan : img.complete || imageData.src != getImgAttr.call(img, "src") || img.lazyload || (isSameSet || !isWinComplete && !inView(img)) && (bestCandidate = curCan,
-			resCandidate;
+						candidateSrc = curSrc, evaled = "lazy", isWinComplete && reevaluateAfterLoad(img))),
-
+					!bestCandidate) for (candidates.sort(ascendingSort), length = candidates.length,
-		if ( sizeDescriptor ) {
+											 bestCandidate = candidates[length - 1], i = 0; length > i; i++) if (candidate = candidates[i],
-			var splitDescriptor = sizeDescriptor.split(" ");
+				candidate.res >= dpr) {
-
+				j = i - 1, bestCandidate = candidates[j] && (diff = candidate.res - dpr) && curSrc != ri.makeUrl(candidate.url) && chooseLowRes(candidates[j].res, diff, dpr) ? candidates[j] : candidate;
-			for (var i = splitDescriptor.length + 1; i >= 0; i--) {
+				break;
-				if ( splitDescriptor[ i ] !== undefined ) {
-					var curr = splitDescriptor[ i ],
-						lastchar = curr && curr.slice( curr.length - 1 );
-
-					if ( ( lastchar === "h" || lastchar === "w" ) && !pf.sizesSupported ) {
-						resCandidate = parseFloat( ( parseInt( curr, 10 ) / widthInCssPixels ) );
-					} else if ( lastchar === "x" ) {
-						var res = curr && parseFloat( curr, 10 );
-						resCandidate = res && !isNaN( res ) ? res : 1;
 			}
+			return curSrc && curCan && (curCan.res -= tLazy), bestCandidate && (candidateSrc = ri.makeUrl(bestCandidate.url),
+			currentSrcSupported || (img.currentSrc = candidateSrc), imageData.curSrc = candidateSrc,
+				imageData.curCan = bestCandidate, candidateSrc != curSrc ? ri.setSrc(img, bestCandidate) : ri.setSize(img)),
+				evaled;
 		}
-			}
-		}
-		return resCandidate || 1;
 	};
-
+	ri.getX = function() {
-	/**
+		return ri.DPR * cfg.xQuant;
-	 * Takes a srcset in the form of url/
+	}, ri.setSrc = function(img, bestCandidate) {
-	 * ex. "images/pic-medium.png 1x, images/pic-medium-2x.png 2x" or
+		var origWidth;
-	 *     "images/pic-medium.png 400w, images/pic-medium-2x.png 800w" or
+		img.src = bestCandidate.url, "image/svg+xml" == bestCandidate.set.type && (origWidth = img.style.width,
-	 *     "images/pic-small.png"
+			img.style.width = img.offsetWidth + 1 + "px", img.offsetWidth + 1 && (img.style.width = origWidth));
-	 * Get an array of image candidates in the form of
+	};
-	 *      {url: "/foo/bar.png", resolution: 1}
+	var intrinsicSizeHandler = function() {
-	 * where resolution is http://dev.w3.org/csswg/css-values-3/#resolution-value
+		off(this, "load", intrinsicSizeHandler), ri.setSize(this);
-	 * If sizes is specified, resolution is calculated
+	};
-	 */
+	ri.setSize = function(img) {
-	pf.getCandidatesFromSourceSet = function( srcset, sizes ) {
+		var width, curCandidate = img[ri.ns].curCan;
-		var candidates = pf.parseSrcset( srcset ),
+		cfg.addSize && curCandidate && !img[ri.ns].dims && (img.complete || (off(img, "load", intrinsicSizeHandler),
-			formattedCandidates = [];
+			on(img, "load", intrinsicSizeHandler)), width = img.naturalWidth, width && ("x" == curCandidate.desc.type ? setImgAttr.call(img, "width", parseInt(width / curCandidate.res / cfg.xQuant, 10)) : "w" == curCandidate.desc.type && setImgAttr.call(img, "width", parseInt(curCandidate.cWidth * (width / curCandidate.desc.val), 10))));
-
+	}, document.addEventListener && "naturalWidth" in image && "complete" in image || (ri.setSize = noop),
-		for ( var i = 0, len = candidates.length; i < len; i++ ) {
+		ri.getSet = function(img) {
-			var candidate = candidates[ i ];
+			var i, set, supportsType, match = !1, sets = img[ri.ns].sets;
-
+			for (i = 0; i < sets.length && !match; i++) if (set = sets[i], set.srcset && ri.matchesMedia(set.media) && (supportsType = ri.supportsType(set.type))) {
-			formattedCandidates.push({
+				"pending" == supportsType && (set = supportsType), match = set;
-				url: candidate.url,
+				break;
-				resolution: pf.parseDescriptor( candidate.descriptor, sizes )
+			}
+			return match;
+		};
+	var alwaysCheckWDescriptor = ri.supSrcset && !ri.supSizes;
+	ri.parseSets = function(element, parent) {
+		var srcsetAttribute, fallbackCandidate, isWDescripor, srcsetParsed, hasPicture = "PICTURE" == parent.nodeName.toUpperCase(), imageData = element[ri.ns];
+		imageData.src === undefined && (imageData.src = getImgAttr.call(element, "src"),
+			imageData.src ? setImgAttr.call(element, srcAttr, imageData.src) : removeImgAttr.call(element, srcAttr)),
+		imageData.srcset === undefined && (srcsetAttribute = getImgAttr.call(element, "srcset"),
+			imageData.srcset = srcsetAttribute, srcsetParsed = !0), imageData.dims === undefined && (imageData.dims = getImgAttr.call(element, "height") && getImgAttr.call(element, "width")),
+			imageData.sets = [], hasPicture && (imageData.pic = !0, getAllSourceElements(parent, imageData.sets)),
+			imageData.srcset ? (fallbackCandidate = {
+				srcset: imageData.srcset,
+				sizes: getImgAttr.call(element, "sizes")
+			}, imageData.sets.push(fallbackCandidate), isWDescripor = alwaysCheckWDescriptor || imageData.src ? hasWDescripor(fallbackCandidate) : !1,
+			isWDescripor || !imageData.src || getCandidateForSrc(imageData.src, fallbackCandidate) || hasOneX(fallbackCandidate) || (fallbackCandidate.srcset += ", " + imageData.src,
+				fallbackCandidate.cands = !1)) : imageData.src && imageData.sets.push({
+				srcset: imageData.src,
+				sizes: null
+			}), imageData.curCan = null, imageData.supported = !(hasPicture || fallbackCandidate && !ri.supSrcset || isWDescripor),
+		srcsetParsed && ri.supSrcset && !imageData.supported && (srcsetAttribute ? (setImgAttr.call(element, srcsetAttr, srcsetAttribute),
+			element.srcset = "") : removeImgAttr.call(element, srcsetAttr)), imageData.parsed = !0;
+	};
+	var reevaluateAfterLoad = function() {
+		var onload = function() {
+			off(this, "load", onload), ri.fillImgs({
+				elements: [ this ]
 			});
-		}
-		return formattedCandidates;
 		};
+		return function(img) {
+			off(img, "load", onload), on(img, "load", onload);
+		};
+	}();
+	ri.fillImg = function(element, options) {
+		var parent, imageData, extreme = options.reparse || options.reevaluate;
+		if (element[ri.ns] || (element[ri.ns] = {}), imageData = element[ri.ns], "lazy" == imageData.evaled && (isWinComplete || element.complete) && (imageData.evaled = !1),
+			extreme || !imageData.evaled) {
+			if (!imageData.parsed || options.reparse) {
+				if (parent = element.parentNode, !parent) return;
+				ri.parseSets(element, parent, options);
+			}
+			imageData.supported ? imageData.evaled = !0 : applyBestCandidate(element);
+		}
+	};
+	var resizeThrottle;
+	ri.setupRun = function(options) {
+		(!alreadyRun || options.reevaluate || isVwDirty) && (cfg.uT || (ri.DPR = window.devicePixelRatio || 1),
+			dprM = Math.min(Math.max(ri.DPR * cfg.xQuant, 1), 2.5), tLow = cfg.tLow * dprM,
+			tLazy = cfg.tLazy * dprM, greed = cfg.greed * dprM, tHigh = cfg.tHigh, tMemory = .6 + .4 * dprM + tLazy),
+		isVwDirty && (lengthCache = {}, sizeLengthCache = {}, updateView(), options.elements || options.context || clearTimeout(resizeThrottle));
+	}, ri.teardownRun = function() {
+		var parent;
+		lengthElInstered && (lengthElInstered = !1, parent = lengthEl.parentNode, parent && parent.removeChild(lengthEl));
+	};
+	var alreadyRun = !1, respimage = function(opt) {
+		var elements, i, plen, options = opt || {};
+		if (options.elements && 1 == options.elements.nodeType && ("IMG" == options.elements.nodeName.toUpperCase() ? options.elements = [ options.elements ] : (options.context = options.elements,
+				options.elements = null)), elements = options.elements || ri.qsa(options.context || document, options.reevaluate || options.reparse ? ri.sel : ri.selShort),
+				plen = elements.length) {
+			for (ri.setupRun(options), alreadyRun = !0, i = 0; plen > i; i++) ri.fillImg(elements[i], options);
+			ri.teardownRun(options);
+		}
+	};
+	ri.fillImgs = respimage, window.HTMLPictureElement ? (respimage = noop, ri.fillImg = noop) : !function() {
+		var regWinComplete = /^loade|^c/, run = function() {
+			clearTimeout(timerId), timerId = setTimeout(run, 3e3), document.body && (regWinComplete.test(document.readyState || "") && (isWinComplete = !0,
+				clearTimeout(timerId), off(document, "readystatechange", run)), ri.fillImgs());
+		}, resizeEval = function() {
+			ri.fillImgs({
+				reevaluate: !0
+			});
+		}, onResize = function() {
+			clearTimeout(resizeThrottle), isVwDirty = !0, resizeThrottle = setTimeout(resizeEval, 99);
+		}, timerId = setTimeout(run, document.body ? 9 : 99);
+		on(window, "resize", onResize), on(document, "readystatechange", run);
+	}(), respimage._ = ri, respimage.config = function(name, value, value2) {
+		if ("addType" == name) {
+			if (types[value] = value2, "pending" == value2) return;
+		} else cfg[name] = value;
+		alreadyRun && ri.fillImgs({
+			reevaluate: !0
+		});
+	}, window.respimage = respimage;
+}(window, document);
+(function( factory ) {
+	"use strict";
+	var interValId;
+	var intervalIndex = 0;
+	var run = function(){
+		if ( window.respimage ) {
+			factory( window.respimage );
+		}
+		if(window.respimage || intervalIndex > 9999){
+			clearInterval(interValId);
+		}
+		intervalIndex++;
+	};
+	interValId = setInterval(run, 8);
 
-	/*
+	run();
-	 * if it's an img element and it has a srcset property,
+
-	 * we need to remove the attribute so we can manipulate src
+}( function( respimage ) {
-	 * (the property's existence infers native srcset support, and a srcset-supporting browser will prioritize srcset's value over our winning picture candidate)
+	"use strict";
-	 * this moves srcset's value to memory for later use and removes the attr
+
-	 */
+	var ri = respimage._;
-	pf.dodgeSrcset = function( img ) {
+	var runningTests = 0;
-		if ( img.srcset ) {
+	var setTypeValue = function(types, value){
-			img[ pf.ns ].srcset = img.srcset;
+		var i;
-			img.removeAttribute( "srcset" );
+		for(i = 0; i < types.length; i++){
+			ri.types[types[i]] = value;
 		}
 	};
 
-	/*
+	if(window.HTMLPictureElement && !ri.cfg.uT){
-	 * Accept a source or img element and process its srcset and sizes attrs
+		respimage.testTypeSupport = function(){};
-	 */
-	pf.processSourceSet = function( el ) {
-		var srcset = el.getAttribute( "srcset" ),
-			sizes = el.getAttribute( "sizes" ),
-			candidates = [];
-
-		// if it's an img element, use the cached srcset property (defined or not)
-		if ( el.nodeName.toUpperCase() === "IMG" && el[ pf.ns ] && el[ pf.ns ].srcset ) {
-			srcset = el[ pf.ns ].srcset;
-		}
-
-		if ( srcset ) {
-			candidates = pf.getCandidatesFromSourceSet( srcset, sizes );
-		}
-		return candidates;
-	};
-
-	pf.applyBestCandidate = function( candidates, picImg ) {
-		var candidate,
-			length,
-			bestCandidate;
-
-		candidates.sort( pf.ascendingSort );
-
-		length = candidates.length;
-		bestCandidate = candidates[ length - 1 ];
-
-		for ( var i = 0; i < length; i++ ) {
-			candidate = candidates[ i ];
-			if ( candidate.resolution >= pf.getDpr() ) {
-				bestCandidate = candidate;
-				break;
-			}
-		}
-
-		if ( bestCandidate && !pf.endsWith( picImg.src, bestCandidate.url ) ) {
-			picImg.src = bestCandidate.url;
-			// currentSrc attribute and property to match
-			// http://picture.responsiveimages.org/#the-img-element
-			picImg.currentSrc = picImg.src;
-		}
-	};
-
-	pf.ascendingSort = function( a, b ) {
-		return a.resolution - b.resolution;
-	};
-
-	/*
-	 * In IE9, <source> elements get removed if they aren't children of
-	 * video elements. Thus, we conditionally wrap source elements
-	 * using <!--[if IE 9]><video style="display: none;"><![endif]-->
-	 * and must account for that here by moving those source elements
-	 * back into the picture element.
-	 */
-	pf.removeVideoShim = function( picture ) {
-		var videos = picture.getElementsByTagName( "video" );
-		if ( videos.length ) {
-			var video = videos[ 0 ],
-				vsources = video.getElementsByTagName( "source" );
-			while ( vsources.length ) {
-				picture.insertBefore( vsources[ 0 ], video );
-			}
-			// Remove the video element once we're finished removing its children
-			video.parentNode.removeChild( video );
-		}
-	};
-
-	/*
-	 * Find all `img` elements, and add them to the candidate list if they have
-	 * a `picture` parent, a `sizes` attribute in basic `srcset` supporting browsers,
-	 * a `srcset` attribute at all, and they haven’t been evaluated already.
-	 */
-	pf.getAllElements = function() {
-		var elems = [],
-			imgs = doc.getElementsByTagName( "img" );
-
-		for ( var h = 0, len = imgs.length; h < len; h++ ) {
-			var currImg = imgs[ h ];
-
-			if ( currImg.parentNode.nodeName.toUpperCase() === "PICTURE" ||
-				( currImg.getAttribute( "srcset" ) !== null ) || currImg[ pf.ns ] && currImg[ pf.ns ].srcset !== null ) {
-				elems.push( currImg );
-			}
-		}
-		return elems;
-	};
-
-	pf.getMatch = function( img, picture ) {
-		var sources = picture.childNodes,
-			match;
-
-		// Go through each child, and if they have media queries, evaluate them
-		for ( var j = 0, slen = sources.length; j < slen; j++ ) {
-			var source = sources[ j ];
-
-			// ignore non-element nodes
-			if ( source.nodeType !== 1 ) {
-				continue;
-			}
-
-			// Hitting the `img` element that started everything stops the search for `sources`.
-			// If no previous `source` matches, the `img` itself is evaluated later.
-			if ( source === img ) {
-				return match;
-			}
-
-			// ignore non-`source` nodes
-			if ( source.nodeName.toUpperCase() !== "SOURCE" ) {
-				continue;
-			}
-			// if it's a source element that has the `src` property set, throw a warning in the console
-			if ( source.getAttribute( "src" ) !== null && typeof console !== undefined ){
-				console.warn("The `src` attribute is invalid on `picture` `source` element; instead, use `srcset`.");
-			}
-
-			var media = source.getAttribute( "media" );
-
-			// if source does not have a srcset attribute, skip
-			if ( !source.getAttribute( "srcset" ) ) {
-				continue;
-			}
-
-			// if there's no media specified, OR w.matchMedia is supported
-			if ( ( !media || pf.matchesMedia( media ) ) ) {
-				var typeSupported = pf.verifyTypeSupport( source );
-
-				if ( typeSupported === true ) {
-					match = source;
-					break;
-				} else if ( typeSupported === "pending" ) {
-					return false;
-				}
-			}
-		}
-
-		return match;
-	};
-
-	function picturefill( opt ) {
-		var elements,
-			element,
-			parent,
-			firstMatch,
-			candidates,
-
-			options = opt || {};
-		elements = options.elements || pf.getAllElements();
-
-		// Loop through all elements
-		for ( var i = 0, plen = elements.length; i < plen; i++ ) {
-			element = elements[ i ];
-			parent = element.parentNode;
-			firstMatch = undefined;
-			candidates = undefined;
-
-			// expando for caching data on the img
-			if ( !element[ pf.ns ] ) {
-				element[ pf.ns ] = {};
-			}
-
-			// if the element has already been evaluated, skip it
-			// unless `options.force` is set to true ( this, for example,
-			// is set to true when running `picturefill` on `resize` ).
-			if ( !options.reevaluate && element[ pf.ns ].evaluated ) {
-				continue;
-			}
-
-			// if `img` is in a `picture` element
-			if ( parent.nodeName.toUpperCase() === "PICTURE" ) {
-
-				// IE9 video workaround
-				pf.removeVideoShim( parent );
-
-				// return the first match which might undefined
-				// returns false if there is a pending source
-				// TODO the return type here is brutal, cleanup
-				firstMatch = pf.getMatch( element, parent );
-
-				// if any sources are pending in this picture due to async type test(s)
-				// remove the evaluated attr and skip for now ( the pending test will
-				// rerun picturefill on this element when complete)
-				if ( firstMatch === false ) {
-					continue;
-				}
-			} else {
-				firstMatch = undefined;
-			}
-
-			// Cache and remove `srcset` if present and we’re going to be doing `picture`/`srcset`/`sizes` polyfilling to it.
-			if ( parent.nodeName.toUpperCase() === "PICTURE" ||
-				( element.srcset && !pf.srcsetSupported ) ||
-				( !pf.sizesSupported && ( element.srcset && element.srcset.indexOf("w") > -1 ) ) ) {
-				pf.dodgeSrcset( element );
-			}
-
-			if ( firstMatch ) {
-				candidates = pf.processSourceSet( firstMatch );
-				pf.applyBestCandidate( candidates, element );
-			} else {
-				// No sources matched, so we’re down to processing the inner `img` as a source.
-				candidates = pf.processSourceSet( element );
-
-				if ( element.srcset === undefined || element[ pf.ns ].srcset ) {
-					// Either `srcset` is completely unsupported, or we need to polyfill `sizes` functionality.
-					pf.applyBestCandidate( candidates, element );
-				} // Else, resolution-only `srcset` is supported natively.
-			}
-
-			// set evaluated to true to avoid unnecessary reparsing
-			element[ pf.ns ].evaluated = true;
-		}
-	}
-
-	/**
-	 * Sets up picture polyfill by polling the document and running
-	 * the polyfill every 250ms until the document is ready.
-	 * Also attaches picturefill on resize
-	 */
-	function runPicturefill() {
-		picturefill();
-		var intervalId = setInterval( function() {
-			// When the document has finished loading, stop checking for new images
-			// https://github.com/ded/domready/blob/master/ready.js#L15
-			picturefill();
-			if ( /^loaded|^i|^c/.test( doc.readyState ) ) {
-				clearInterval( intervalId );
 		return;
 	}
-		}, 250 );
+
-		if ( w.addEventListener ) {
+	ri.types["image/bmp"] = true;
-			var resizeThrottle;
+	ri.types["image/x-bmp"] = true;
-			w.addEventListener( "resize", function() {
+
-				if (!w._picturefillWorking) {
+	respimage.testTypeSupport = function(types, url, width, useCanvas){
-					w._picturefillWorking = true;
+		if(typeof types == "string"){
-					w.clearTimeout( resizeThrottle );
+			types = types.split(/\s*\,*\s+/g);
-					resizeThrottle = w.setTimeout( function() {
-						picturefill({ reevaluate: true });
-						w._picturefillWorking = false;
-					}, 60 );
 		}
-			}, false );
+		var canvas;
+		var supports = "pending";
+		var img = document.createElement('img');
+		var onComplete = function(){
+			runningTests--;
+			setTypeValue(types, supports);
+			if(runningTests < 1){
+				respimage({reevaluate: true});
+			}
+		};
+
+		if(useCanvas){
+			canvas = document.createElement('canvas');
+			if(!canvas.getContext){
+				setTypeValue(types, false);
+				return;
 			}
 		}
 
-	runPicturefill();
+		img.onload = function(){
+			var ctx;
+			supports = true;
+			if(width){
+				supports = img.width == width;
+			}
 
-	/* expose methods for testing */
+			if(useCanvas){
-	picturefill._ = pf;
+				ctx = canvas.getContext('2d');
+				ctx.drawImage(img, 0, 0);
+				supports = ctx.getImageData(0, 0, 1, 1).data[3] === 0;
+			}
+			onComplete();
+		};
 
-	/* expose picturefill */
+		img.onerror = function(){
-	w.picturefill = picturefill;
+			supports = false;
+			onComplete();
+		};
+		runningTests++;
+		setTypeValue(types, "pending");
+		img.src = url;
+	};
+
+
+	respimage.testTypeSupport("image/webp", "data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==", 1);
+	respimage.testTypeSupport("image/jp2 image/jpx image/jpm", "data:image/jp2;base64,AAAADGpQICANCocKAAAAFGZ0eXBqcDIgAAAAAGpwMiAAAABHanAyaAAAABZpaGRyAAAAAQAAAAEAAQAHAAAAAAAPY29scgEAAAAAABEAAAAacmVzIAAAABJyZXNjAGAA/gBgAP4EBAAAAABqcDJj/0//UQApAAAAAAABAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAAABAAEB/1wADUAIEBAYEBAYEBAY/1IADAAAAAEAAwQEAAH/ZAAPAAFMV0ZfSlAyXzIxMf+QAAoAAAAAABIAAf+TgICAgP/Z", 1);
+	respimage.testTypeSupport("image/vnd.ms-photo", "data:image/vnd.ms-photo;base64,SUm8AQgAAAAFAAG8AQAQAAAASgAAAIC8BAABAAAAAQAAAIG8BAABAAAAAQAAAMC8BAABAAAAWgAAAMG8BAABAAAAHwAAAAAAAAAkw91vA07+S7GFPXd2jckNV01QSE9UTwAZAYBxAAAAABP/gAAEb/8AAQAAAQAAAA==", 1);
+	respimage.testTypeSupport("video/png video/apng video/x-mng video/x-png", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACGFjVEwAAAABAAAAAcMq2TYAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAGmZjVEwAAAAAAAAAAQAAAAEAAAAAAAAAAAD6A+gBAbNU+2sAAAARZmRBVAAAAAEImWNgYGBgAAAABQAB6MzFdgAAAABJRU5ErkJggg==", false, true);
+
+}));
 
 (function(){
 
@@ -570,10 +431,9 @@ webshim.ready('matchMedia', function($, webshim, w, doc, undefined){
 	var sel = 'picture, img[srcset]';
 	webshim.addReady(function(context){
 		if(context.querySelector(sel)){
-				window.picturefill();
+			window.respimage();
 		}
 	});
 })();
-} );
 
 

public/webshims/shims/styles/forms-ext.css

@@ -140,11 +140,11 @@ SASS:
 }
 @font-face {
   font-family: 'widget';
-  src: url(data:application/font-woff;charset=utf-8;base64,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) format("woff"), url("widget.ttf") format("truetype");
+  src: url(data:application/font-woff;charset=utf-8;base64,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) format("woff"), url("widget.ttf") format("truetype");
   font-weight: normal;
   font-style: normal;
 }
-.ws-popover-opener > span, .time-input-buttons .ws-popover-opener > span {
+.ws-popover-opener > span, .time-input-buttons .ws-popover-opener > span, .ws-capture-button {
   font-family: 'widget';
   speak: none;
   font-style: normal;
@@ -166,6 +166,10 @@ SASS:
   content: "\f017";
 }
 
+.ws-capture-button:before {
+  content: "\e600";
+}
+
 .ws-range,
 .ws-range-rail,
 .ws-range span > span,
@@ -255,6 +259,10 @@ span.has-input-buttons {
   margin: -8px 0 0 -8px;
 }
 
+.ws-capture-button:before {
+  font-family: 'widget';
+}
+
 .color-input-buttons .ws-popover-opener > span {
   background: url(color-picker.png) no-repeat 0 0;
 }
@@ -472,7 +480,7 @@ span.ws-input {
   height: 1.38462em;
   width: 2.30769em;
   background: #ccc;
-  border: 0.07692em solid #aaaaaa;
+  border: 0.07692em solid #aaa;
   cursor: pointer;
   transition: background-color 400ms, border-color 400ms;
 }
@@ -496,7 +504,7 @@ span.ws-input {
   padding: 0.07692em 0.26923em;
   text-align: center;
   background: #fff;
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   visibility: visible;
 }
 .ws-range.ws-focus .ws-range-thumb {

public/webshims/shims/styles/forms-picker.css

@@ -137,7 +137,7 @@ SASS:
 }
 .input-picker .ws-picker-controls > button {
   box-sizing: content-box;
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   padding: 0;
   width: 1.84615em;
   height: 1.84615em;
@@ -228,15 +228,15 @@ SASS:
 .input-picker .ws-button-row {
   position: relative;
   margin: 0.76923em 0 0;
-  border-top: 0.07692em solid #eeeeee;
+  border-top: 0.07692em solid #eee;
   padding: 0.76923em 0 0;
   text-align: left;
   z-index: 2;
 }
 .input-picker .ws-button-row > button {
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   background-color: #ddd;
-  background-image: linear-gradient(to bottom, #ececec 0%, #dddddd 100%);
+  background-image: linear-gradient(to bottom, #ececec 0%, #ddd 100%);
   transition: border-color 200ms linear;
   float: left;
 }
@@ -383,7 +383,7 @@ SASS:
 }
 .input-picker .ws-options {
   margin: 0.76923em 0 0;
-  border-top: 0.07692em solid #eeeeee;
+  border-top: 0.07692em solid #eee;
   padding: 0.76923em 0 0;
   text-align: left;
 }

public/webshims/shims/styles/scss/forms-ext.scss

@@ -7,7 +7,7 @@
 }
 @font-face {
 	font-family: 'widget';
-	src: url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AAAbMAAoAAAAABoQAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAAA08AAANPG9W6FE9TLzIAAAREAAAAYAAAAGAIIwcpY21hcAAABKQAAABUAAAAVPCu8JlnYXNwAAAE+AAAAAgAAAAIAAAAEGhlYWQAAAUAAAAANgAAADYABTw7aGhlYQAABTgAAAAkAAAAJAO9AedobXR4AAAFXAAAABgAAAAYBNwAAG1heHAAAAV0AAAABgAAAAYABlAAbmFtZQAABXwAAAEwAAABMOvWjh9wb3N0AAAGrAAAACAAAAAgAAMAAAEABAQAAQEBB3dpZGdldAABAgABADr4HAL4GwP4GAQeCgAZU/+Lix4KABlT/4uLDAeLZviU+HQFHQAAAHkPHQAAAH4RHQAAAAkdAAADRhIABwEBBw0PERQZHndpZGdldHdpZGdldHUwdTF1MjB1RjAxN3VGMDczAAACAYkABAAGAgABAAQABwAKAA0BAQK4/JQO/JQO/JQO+5QO95T31hWL+xQFi4mKiImKiomJioiLCC+LBYmLiYyJjYmMio6LjQiLngWLjYyNjY2NjY2MjYsIy4uL7wWLjoyNjY2NjY2LjosInYsFjouNi4yJjYmMiYuICPcLJxWLp4SlfaN9o3idc5l0mXGSbotvi3GEc310fXh5fXN9c4Rxi2+Lb5JxmXOZc554on0Io32lhKeLqIulkqKZo5menpmjmaOSpYunCMuLFYtjgWZ3anhpcHBqeGl3ZoFji2SLZpVpn2qecKZ3rXisgbCLs4uzla+erZ+spqasnwitnrCVsouzi7CBrXisd6ZwnmqfaZVni2MIDmewixXdi4vdOYuLOQXvixXni4vdL4uLOQUn8BXdi4vmOYuLMAXvixXni4vmL4uLMAUn9wEV3YuL3jmLizgF92b7ZhXmi4vdMIuLOQX7AvdmFeeLi94vi4s4Bfdw+2YV3YuL3TmLizkF+wLwFeaLi+Ywi4swBSb3ihWL3gWLjYqNio2JjYmMiIsIeYsFiIuJiomJiomKiYuJCIs4BYuJjImMiY2JjYqOiwidiwWOi42MjY2MjYyNi40I92f7ihXdi4vmOYuLMAX7AvcBFeaLi94wi4s4BfcCixXdi4veOYuLOAWU9x0Vi94Fi42KjYmNiY2JjImLCHiLBYmLiYqJiYmJiomLiQiLOAWLiYyJjYmNiY2KjYsInosFjYuNjI2NjY2MjYuNCPcBnhWL/AIFi4GIg4SDg4SDh4GLCPwmiwWBi4KPhJKEk4eTi5UIi/gCBYuVj5OSkpKTlI6Viwivi4unBYuXkJaUlJSUlY+YiwidiwWYi5WHlIKUgpCAi38Ii2/3AouLpwWLl4+WlJSUlJaPl4sInosFl4uWh5SClIKPgIt/CItvsIsFlYuTiJODkoSOg4uBCA74lBT4lBWLDAoAAAMCAAGQAAUAAAFMAWYAAABHAUwBZgAAAPUAGQCEAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA8HMB4P/g/+AB4AAgAAAAAQAAAAAAAAAAAAAAIAAAAAAAAgAAAAMAAAAUAAMAAQAAABQABABAAAAADAAIAAIABAABACDwF/Bz//3//wAAAAAAIPAX8HP//f//AAH/4w/tD5IAAwABAAAAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAEAAG0trL5fDzz1AAsCAAAAAADPhX3EAAAAAM+FfcQAAP/bAdsB2wAAAAgAAgAAAAAAAAABAAAB4P/gAAACAAAAAAAB2wABAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAEAAAACAAAAAdwAAAAAUAAABgAAAAAADgCuAAEAAAAAAAEADAAAAAEAAAAAAAIADgBAAAEAAAAAAAMADAAiAAEAAAAAAAQADABOAAEAAAAAAAUAFgAMAAEAAAAAAAYABgAuAAEAAAAAAAoAKABaAAMAAQQJAAEADAAAAAMAAQQJAAIADgBAAAMAAQQJAAMADAAiAAMAAQQJAAQADABOAAMAAQQJAAUAFgAMAAMAAQQJAAYADAA0AAMAAQQJAAoAKABaAHcAaQBkAGcAZQB0AFYAZQByAHMAaQBvAG4AIAAxAC4AMAB3AGkAZABnAGUAdHdpZGdldAB3AGkAZABnAGUAdABSAGUAZwB1AGwAYQByAHcAaQBkAGcAZQB0AEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('woff'),
+	src: url(data:application/font-woff;charset=utf-8;base64,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) format('woff'),
 	url('widget.ttf') format('truetype');
 	font-weight: normal;
 	font-style: normal;
@@ -43,6 +43,34 @@
 	}
 }
 
+%icon-folder-open {
+	@extend %iconbase;
+	&:before {
+		content: "\e601";
+	}
+}
+
+%icon-close {
+	@extend %iconbase;
+	&:before {
+		content: "\e602";
+	}
+}
+
+%icon-checkmark {
+	@extend %iconbase;
+	&:before {
+		content: "\e603";
+	}
+}
+
+%icon-camera {
+	@extend %iconbase;
+	&:before {
+		content: "\e600";
+	}
+}
+
 .ws-range,
 .ws-range-rail,
 .ws-range span > span,
@@ -142,6 +170,14 @@ span.has-input-buttons {
 	}
 }
 
+.ws-capture-button {
+	@extend %icon-camera;
+
+	&:before {
+		font-family: 'widget';
+	}
+}
+
 .color-input-buttons .ws-popover-opener > span {
 
 	background: url(color-picker.png) no-repeat 0 0;

public/webshims/shims/styles/scss/shim.scss

@@ -588,7 +588,6 @@ summary {
 	border-width: em(10) em(5) 0 em(5);
 	border-color: #000 transparent transparent transparent;
 
-	
 	vertical-align: middle;
 
 	.closed-details-summary & {
@@ -622,7 +621,7 @@ summary.summary-has-focus {
 		position: relative;
 		z-index: 0;
 		display: inline-block;
-		padding: 5px;
+		padding: em(5);
 		border: 1px solid #ccc;
 		background: #eee;
 		color: #333;
@@ -635,6 +634,11 @@ summary.summary-has-focus {
 	}
 }
 
+.ws-capture-file > button {
+	padding-bottom: em(4);
+	padding-top: em(4);
+}
+
 .ws-custom-file {
 	.ws-file-value {
 		display: block;
@@ -729,9 +733,7 @@ summary.summary-has-focus {
 	bottom: auto;
 	position: static;
 	position: -webkit-sticky;
-	position: -moz-sticky;
 	position: -ms-sticky;
-	position: -o-sticky;
 	position: sticky;
 	float: none !important;
 	margin-left: 0;

public/webshims/shims/styles/shim-ext.css

@@ -288,7 +288,7 @@ output {
 }
 
 .ws-po-box {
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   background: #fff;
   color: #000;
   padding: 0.38462em 0.38462em 0.23077em;
@@ -303,7 +303,7 @@ output {
   height: 0;
   border-left: 0.61538em solid transparent;
   border-right: 0.61538em solid transparent;
-  border-bottom: 0.61538em solid #cccccc;
+  border-bottom: 0.61538em solid #ccc;
   border-top: none;
   zoom: 1;
 }
@@ -323,7 +323,7 @@ output {
   top: auto;
   bottom: 0.30769em;
   border-bottom: none;
-  border-top: 0.61538em solid #cccccc;
+  border-top: 0.61538em solid #ccc;
 }
 html .ws-po-arrow {
   border-left-color: transparent;
@@ -609,7 +609,7 @@ summary.summary-has-focus {
   position: relative;
   z-index: 0;
   display: inline-block;
-  padding: 5px;
+  padding: 0.38462em;
   border: 1px solid #ccc;
   background: #eee;
   color: #333;
@@ -621,6 +621,11 @@ summary.summary-has-focus {
   float: left;
 }
 
+.ws-capture-file > button {
+  padding-bottom: 0.30769em;
+  padding-top: 0.30769em;
+}
+
 .ws-custom-file .ws-file-value {
   display: block;
   overflow: hidden;
@@ -670,7 +675,7 @@ summary.summary-has-focus {
 .ws-custom-file > input[type="file"]:focus ~ button {
   background: #fff;
   border-color: #999;
-  background: #eeeeee linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
+  background: #eee linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
 }
 .ws-custom-file:hover > .ws-file-value, .ws-custom-file.ws-mouseenter > .ws-file-value,
 .ws-custom-file > input[type="file"]:focus ~ .ws-file-value {
@@ -698,9 +703,7 @@ summary.summary-has-focus {
   bottom: auto;
   position: static;
   position: -webkit-sticky;
-  position: -moz-sticky;
   position: -ms-sticky;
-  position: -o-sticky;
   position: sticky;
   float: none !important;
   margin-left: 0;
@@ -870,11 +873,11 @@ SASS:
 }
 @font-face {
   font-family: 'widget';
-  src: url(data:application/font-woff;charset=utf-8;base64,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) format("woff"), url("widget.ttf") format("truetype");
+  src: url(data:application/font-woff;charset=utf-8;base64,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) format("woff"), url("widget.ttf") format("truetype");
   font-weight: normal;
   font-style: normal;
 }
-.ws-popover-opener > span, .time-input-buttons .ws-popover-opener > span {
+.ws-popover-opener > span, .time-input-buttons .ws-popover-opener > span, .ws-capture-button {
   font-family: 'widget';
   speak: none;
   font-style: normal;
@@ -896,6 +899,10 @@ SASS:
   content: "\f017";
 }
 
+.ws-capture-button:before {
+  content: "\e600";
+}
+
 .ws-range,
 .ws-range-rail,
 .ws-range span > span,
@@ -985,6 +992,10 @@ span.has-input-buttons {
   margin: -8px 0 0 -8px;
 }
 
+.ws-capture-button:before {
+  font-family: 'widget';
+}
+
 .color-input-buttons .ws-popover-opener > span {
   background: url(color-picker.png) no-repeat 0 0;
 }
@@ -1202,7 +1213,7 @@ span.ws-input {
   height: 1.38462em;
   width: 2.30769em;
   background: #ccc;
-  border: 0.07692em solid #aaaaaa;
+  border: 0.07692em solid #aaa;
   cursor: pointer;
   transition: background-color 400ms, border-color 400ms;
 }
@@ -1226,7 +1237,7 @@ span.ws-input {
   padding: 0.07692em 0.26923em;
   text-align: center;
   background: #fff;
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   visibility: visible;
 }
 .ws-range.ws-focus .ws-range-thumb {

public/webshims/shims/styles/shim.css

@@ -288,7 +288,7 @@ output {
 }
 
 .ws-po-box {
-  border: 0.07692em solid #cccccc;
+  border: 0.07692em solid #ccc;
   background: #fff;
   color: #000;
   padding: 0.38462em 0.38462em 0.23077em;
@@ -303,7 +303,7 @@ output {
   height: 0;
   border-left: 0.61538em solid transparent;
   border-right: 0.61538em solid transparent;
-  border-bottom: 0.61538em solid #cccccc;
+  border-bottom: 0.61538em solid #ccc;
   border-top: none;
   zoom: 1;
 }
@@ -323,7 +323,7 @@ output {
   top: auto;
   bottom: 0.30769em;
   border-bottom: none;
-  border-top: 0.61538em solid #cccccc;
+  border-top: 0.61538em solid #ccc;
 }
 html .ws-po-arrow {
   border-left-color: transparent;
@@ -609,7 +609,7 @@ summary.summary-has-focus {
   position: relative;
   z-index: 0;
   display: inline-block;
-  padding: 5px;
+  padding: 0.38462em;
   border: 1px solid #ccc;
   background: #eee;
   color: #333;
@@ -621,6 +621,11 @@ summary.summary-has-focus {
   float: left;
 }
 
+.ws-capture-file > button {
+  padding-bottom: 0.30769em;
+  padding-top: 0.30769em;
+}
+
 .ws-custom-file .ws-file-value {
   display: block;
   overflow: hidden;
@@ -670,7 +675,7 @@ summary.summary-has-focus {
 .ws-custom-file > input[type="file"]:focus ~ button {
   background: #fff;
   border-color: #999;
-  background: #eeeeee linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
+  background: #eee linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
 }
 .ws-custom-file:hover > .ws-file-value, .ws-custom-file.ws-mouseenter > .ws-file-value,
 .ws-custom-file > input[type="file"]:focus ~ .ws-file-value {
@@ -698,9 +703,7 @@ summary.summary-has-focus {
   bottom: auto;
   position: static;
   position: -webkit-sticky;
-  position: -moz-sticky;
   position: -ms-sticky;
-  position: -o-sticky;
   position: sticky;
   float: none !important;
   margin-left: 0;

public/webshims/shims/styles/widget.svg

@@ -7,6 +7,10 @@
 <font-face units-per-em="512" ascent="480" descent="-32" />
 <missing-glyph horiz-adv-x="512" />
 <glyph unicode="&#x20;" d="" horiz-adv-x="256" />
-<glyph unicode="&#xf017;" d="M256 322.286v-128q0-4-2.571-6.572t-6.571-2.572h-91.428q-4 0-6.572 2.572t-2.571 6.572v18.286q0 4 2.571 6.572t6.572 2.571h64v100.572q0 4 2.571 6.572t6.571 2.571h18.286q4 0 6.572-2.571t2.572-6.572zM374.857 221.714q0 42.286-20.857 78t-56.572 56.571-78 20.857-78-20.857-56.572-56.571-20.857-78 20.857-78 56.572-56.572 78-20.857 78 20.857 56.572 56.572 20.857 78zM438.857 221.714q0-59.714-29.428-110.143t-79.857-79.857-110.143-29.428-110.143 29.428-79.857 79.857-29.428 110.143 29.428 110.143 79.857 79.857 110.143 29.428 110.143-29.428 79.857-79.857 29.428-110.143z" />
+<glyph unicode="&#xe600;" d="M0 73.143v256q0 30.286 21.428 51.714t51.715 21.428h64l14.571 38.857q5.428 14 19.857 24.143t29.571 10.143h146.286q15.143 0 29.572-10.143t19.857-24.143l14.572-38.857h64q30.286 0 51.715-21.428t21.428-51.714v-256q0-30.286-21.428-51.714t-51.714-21.428h-402.286q-30.285 0-51.715 21.428t-21.428 51.714zM146.286 201.143q0-52.857 37.572-90.428t90.428-37.572 90.428 37.572 37.572 90.428-37.572 90.428-90.428 37.572-90.428-37.572-37.572-90.428zM192 201.143q0 34 24.143 58.143t58.143 24.143 58.143-24.143 24.143-58.143-24.143-58.143-58.143-24.143-58.143 24.143-24.143 58.143z" horiz-adv-x="549" />
-<glyph unicode="&#xf073;" d="M36.572 0h82.285v82.286h-82.285v-82.286zM137.143 0h91.429v82.286h-91.428v-82.286zM36.572 100.572h82.285v91.428h-82.285v-91.428zM137.143 100.572h91.429v91.428h-91.428v-91.428zM36.572 210.286h82.285v82.286h-82.285v-82.286zM246.857 0h91.429v82.286h-91.428v-82.286zM137.143 210.286h91.429v82.286h-91.428v-82.286zM356.572 0h82.286v82.286h-82.286v-82.286zM246.857 100.572h91.429v91.428h-91.428v-91.428zM146.286 347.429v82.285q0 3.715-2.714 6.429t-6.428 2.714h-18.285q-3.715 0-6.428-2.714t-2.715-6.429v-82.285q0-3.714 2.715-6.428t6.428-2.714h18.285q3.714 0 6.428 2.714t2.714 6.428zM356.572 100.572h82.286v91.428h-82.286v-91.428zM246.857 210.286h91.429v82.286h-91.428v-82.286zM356.572 210.286h82.286v82.286h-82.286v-82.286zM365.714 347.429v82.285q0 3.715-2.714 6.429t-6.428 2.714h-18.286q-3.714 0-6.428-2.714t-2.714-6.429v-82.285q0-3.714 2.714-6.428t6.428-2.714h18.286q3.714 0 6.428 2.714t2.714 6.428zM475.428 365.714v-365.714q0-14.857-10.857-25.714t-25.714-10.857h-402.286q-14.857 0-25.715 10.857t-10.857 25.714v365.714q0 14.857 10.857 25.714t25.715 10.857h36.572v27.428q0 18.857 13.428 32.285t32.285 13.429h18.285q18.857 0 32.285-13.429t13.428-32.285v-27.428h109.714v27.428q0 18.857 13.428 32.285t32.286 13.429h18.286q18.857 0 32.286-13.429t13.428-32.285v-27.428h36.572q14.857 0 25.714-10.857t10.857-25.714z" horiz-adv-x="476" />
+<glyph unicode="&#xe601;" d="M416 0l96 256h-416l-96-256zM64 288l-64-288v416h144l64-64h208v-64z" />
+<glyph unicode="&#xe602;" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" />
+<glyph unicode="&#xe603;" d="M432 416l-240-240-112 112-80-80 192-192 320 320z" />
+<glyph unicode="&#xf017;" d="M0 219.429q0 59.714 29.428 110.143t79.857 79.857 110.143 29.428 110.143-29.428 79.857-79.857 29.428-110.143-29.428-110.143-79.857-79.857-110.143-29.428-110.143 29.428-79.857 79.857-29.428 110.143zM64 219.429q0-42.286 20.857-78t56.571-56.572 78-20.857 78 20.857 56.572 56.572 20.857 78-20.857 78-56.572 56.572-78 20.857-78-20.857-56.572-56.572-20.857-78zM146.286 192v18.286q0 4 2.571 6.572t6.571 2.571h64v100.572q0 4 2.571 6.572t6.571 2.571h18.286q4 0 6.572-2.571t2.571-6.572v-128q0-4-2.571-6.572t-6.572-2.572h-91.428q-4 0-6.572 2.572t-2.571 6.572z" />
+<glyph unicode="&#xf073;" d="M0 0v365.714q0 14.857 10.857 25.714t25.715 10.857h36.572v27.429q0 18.857 13.428 32.286t32.285 13.428h18.285q18.857 0 32.286-13.428t13.428-32.286v-27.429h109.714v27.429q0 18.857 13.428 32.286t32.286 13.428h18.286q18.857 0 32.286-13.428t13.428-32.286v-27.429h36.572q14.857 0 25.714-10.857t10.857-25.714v-365.714q0-14.857-10.857-25.714t-25.714-10.857h-402.286q-14.857 0-25.715 10.857t-10.857 25.714zM36.572 0h82.285v82.286h-82.285v-82.286zM36.572 100.572h82.285v91.428h-82.285v-91.428zM36.572 210.286h82.285v82.286h-82.285v-82.286zM109.715 347.429q0-3.714 2.715-6.428t6.428-2.714h18.285q3.714 0 6.429 2.714t2.714 6.428v82.286q0 3.714-2.714 6.428t-6.428 2.714h-18.285q-3.715 0-6.428-2.714t-2.715-6.428v-82.286zM137.143 0h91.429v82.286h-91.428v-82.286zM137.143 100.572h91.429v91.428h-91.428v-91.428zM137.143 210.286h91.429v82.286h-91.428v-82.286zM246.857 0h91.429v82.286h-91.428v-82.286zM246.857 100.572h91.429v91.428h-91.428v-91.428zM246.857 210.286h91.429v82.286h-91.428v-82.286zM329.143 347.429q0-3.714 2.714-6.428t6.428-2.714h18.286q3.714 0 6.428 2.714t2.714 6.428v82.286q0 3.714-2.714 6.428t-6.428 2.714h-18.286q-3.714 0-6.428-2.714t-2.714-6.428v-82.286zM356.572 0h82.286v82.286h-82.286v-82.286zM356.572 100.572h82.286v91.428h-82.286v-91.428zM356.572 210.286h82.286v82.286h-82.286v-82.286z" horiz-adv-x="476" />
 </font></defs></svg>

public/webshims/shims/track.js

@@ -112,10 +112,11 @@ webshims.register('track', function($, webshims, window, document, undefined){
 	var copyName = {srclang: 'language'};
 
 	var updateMediaTrackList = function(baseData, trackList){
+		var i, len;
+		var callChange = false;
 		var removed = [];
 		var added = [];
 		var newTracks = [];
-		var i, len;
 		if(!baseData){
 			baseData =  webshims.data(this, 'mediaelementBase') || webshims.data(this, 'mediaelementBase', {});
 		}
@@ -156,6 +157,7 @@ webshims.register('track', function($, webshims, window, document, undefined){
 			
 			for(i = 0, len = newTracks.length; i < len; i++){
 				trackList.push(newTracks[i]);
+
 			}
 			for(i = 0, len = removed.length; i < len; i++){
 				$([trackList]).triggerHandler($.Event({type: 'removetrack', track: removed[i]}));
@@ -168,6 +170,16 @@ webshims.register('track', function($, webshims, window, document, undefined){
 				$(this).triggerHandler('updatetrackdisplay');
 			}
 		}
+
+		for(i = 0, len = trackList.length; i < len; i++){
+			if(trackList[i].__wsmode != trackList[i].mode){
+				trackList[i].__wsmode = trackList[i].mode;
+				callChange = true;
+			}
+		}
+		if(callChange){
+			$([trackList]).triggerHandler('change');
+		}
 	};
 	
 	var refreshTrack = function(track, trackData){

public/webshims/shims/url.js

@@ -99,8 +99,8 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 						name = bytes;
 						value = '';
 					}
-					name = name.replace('+', ' ');
+					name = name.replace(/\+/g, ' ');
-					value = value.replace('+', ' ');
+					value = value.replace(/\+/g, ' ');
 					pairs.push({ name: name, value: value });
 				});
 				var output = [];
@@ -110,7 +110,7 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 						value: decodeURIComponent(pair.value)
 					});
 				});
-				return output; // Spec bug?
+				return output;
 			}
 
 			function URLSearchParams(url_object, init) {
@@ -142,10 +142,10 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 						output += name + '=' + value;
 						first = false;
 					});
-					return output;
+					return output.replace(/%20/g, '+');
 				}
 
-				webshim.defineProperties(this, {
+				Object.defineProperties(this, {
 					append: {
 						value: function (name, value) {
 							pairs.push({ name: name, value: value });
@@ -203,6 +203,7 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 								if (pairs[i].name === name) {
 									if (!found) {
 										pairs[i].value = value;
+										found = true;
 										++i;
 									} else {
 										pairs.splice(i, 1);
@@ -211,6 +212,10 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 									++i;
 								}
 							}
+
+							if (!found)
+								pairs.push({ name: name, value: value });
+
 							updateSteps();
 						}
 					},
@@ -226,7 +231,7 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 			var queryObject = new URLSearchParams(
 				self, instance.search ? instance.search.substring(1) : null);
 
-			webshim.defineProperties(self, {
+			Object.defineProperties(self, {
 				href: {
 					get: function () { return instance.href; },
 					set: function (v) { instance.href = v; tidy_instance(); update_steps(); }
@@ -287,6 +292,12 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 				hash: {
 					get: function () { return instance.hash; },
 					set: function (v) { instance.hash = v; tidy_instance(); }
+				},
+				toString: {
+					value: function() { return instance.toString(); }
+				},
+				valueOf: {
+					value: function() { return instance.valueOf(); }
 				}
 			});
 
@@ -299,7 +310,7 @@ webshim.register('url', function($, webshims, window, document, undefined, optio
 			function update_steps() {
 				queryObject._setPairs(instance.search ? parse(instance.search.substring(1)) : []);
 				queryObject._updateSteps();
-			}
+			};
 
 			return self;
 		};

test/controllers/events_controller_test.rb

@@ -52,7 +52,7 @@ class EventsControllerTest < ActionController::TestCase
       assert_empty assigns(:event).errors.messages
     end
 
-    assert_redirected_to root_url
+    assert_redirected_to :root
   end
 
   test 'should not create event' do
@@ -75,7 +75,7 @@ class EventsControllerTest < ActionController::TestCase
 
   test 'should not get edit' do
     get :edit, id: @event
-    assert_redirected_to root_url
+    assert_redirected_to :root
   end
 
   test 'should preview' do
@@ -125,6 +125,6 @@ class EventsControllerTest < ActionController::TestCase
       delete :destroy, id: @event, secret: @event.secret
     end
 
-    assert_redirected_to events_path
+    assert_redirected_to :root
   end
 end

test/controllers/moderations_controller_test.rb

@@ -29,7 +29,7 @@ class ModerationsControllerTest < ActionController::TestCase
       title: 'hello world',
       related_region: regions(:region_one)
     }
-    assert_redirected_to moderations_path
+    assert_redirected_to :moderations
   end
 
   test 'should not edit event' do
@@ -54,7 +54,7 @@ class ModerationsControllerTest < ActionController::TestCase
 
     assert decision < assigns(:moderation).decision_time
 
-    assert_redirected_to moderations_path
+    assert_redirected_to :moderations
   end
 
   test 'should update event' do
@@ -69,7 +69,7 @@ class ModerationsControllerTest < ActionController::TestCase
     }
 
     assert_empty assigns(:moderation).errors
-    assert_redirected_to moderations_path
+    assert_redirected_to :moderations
   end
 
   test 'should not update event' do
@@ -95,7 +95,7 @@ class ModerationsControllerTest < ActionController::TestCase
 
     assert_empty assigns(:moderation).errors
 
-    assert_redirected_to moderations_path
+    assert_redirected_to :moderations
   end
 
   test 'should reject event with a reason' do
@@ -105,6 +105,6 @@ class ModerationsControllerTest < ActionController::TestCase
 
     assert_empty assigns(:moderation).errors
 
-    assert_redirected_to moderations_path
+    assert_redirected_to :moderations
   end
 end

test/models/event_test.rb

@@ -74,11 +74,11 @@ class EventTest < ActiveSupport::TestCase
     assert @event.moderated?, @event.errors.messages
   end
 
-  test 'named scope future.in' do
+  test 'named scope future.daylimit' do
     assert Event.respond_to? :future
-    assert Event.respond_to? :in
+    assert Event.respond_to? :daylimit
-    assert_match(/<= end_time/, Event.future.in(nil).where_values[0])
+    assert_match(/<= end_time/, Event.future.daylimit(nil).where_values[0])
-    assert_match(/end_time <=/, Event.future.in(nil).where_values[1])
+    assert_match(/end_time <=/, Event.future.daylimit(nil).where_values[1])
   end
 
   test 'named scope year' do