pageflow 12.6.0 → 13.0.0.beta1

data/db/migrate/20140418240000_add_attributes_to_users.rb

@@ -1,4 +1,4 @@
-class AddAttributesToUsers < ActiveRecord::Migration
+class AddAttributesToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :failed_attempts, :integer, default: 0
     add_column :users, :locked_at, :datetime
@@ -6,10 +6,7 @@ class AddAttributesToUsers < ActiveRecord::Migration
     add_column :users, :first_name, :string
     add_column :users, :last_name, :string
     add_column :users, :suspended_at, :datetime
-    add_column :users, :account_id, :integer
-    add_column :users, :role, :string, default: "editor", null: false
-
-    add_index :users, [:account_id], name: "index_pageflow_users_on_account_id", using: :btree
-    add_index :users, [:email], name: "index_pageflow_users_on_email", unique: true, using: :btree
+    add_column :users, :locale, :string
+    add_column :users, :admin, :boolean, null: false, default: false
   end
 end

data/lib/generators/pageflow/resque/resque_generator.rb

@@ -9,11 +9,14 @@ module Pageflow
 
       def create_initializers
         template 'resque.rb', 'config/initializers/resque.rb'
-        template 'resque_mailer.rb', 'config/initializers/resque_mailer.rb'
-        template 'resque_logger.rb', 'config/initializers/resque_logger.rb'
         template 'resque_enqueue_after_commit_patch.rb', 'config/initializers/resque_enqueue_after_commit_patch.rb'
-        template 'devise_async.rb', 'config/initializers/devise_async.rb'
         template 'resque.rake', 'lib/tasks/resque.rake'
+
+        inject_into_file 'config/application.rb', after: "config.load_defaults 5.2\n" do
+          <<-RUBY
+    config.active_job.queue_adapter = :resque
+RUBY
+        end
       end
     end
   end

data/lib/pageflow.rb

@@ -27,7 +27,7 @@ module Pageflow
   end
 
   def self.active_admin_settings(config)
-    config.before_filter do
+    config.before_action do
       I18n.locale = current_user.try(:locale) || http_accept_language.compatible_language_from(I18n.available_locales) || I18n.default_locale
     end
   end

data/lib/pageflow/ability_mixin.rb

@@ -259,7 +259,6 @@ module Pageflow
         can :manage, [Entry, Revision]
         can :manage, Pageflow.config.file_types.map(&:model)
         can :manage, Folder
-        can :manage, Resque
         can :manage, Theming
         can :manage, ::User
       end

data/lib/pageflow/active_admin_patches/views/attributes_table.rb

@@ -19,7 +19,7 @@ module Pageflow
             type = value ? types.first : types.last
 
             if type
-              status_tag(status, type, class: name.to_s.gsub(/\?$/, ''), label: text)
+              status_tag(status, class: [type, name.to_s.gsub(/\?$/, '')].join(' '), label: text)
             else
               text
             end

data/lib/pageflow/active_admin_patches/views/table_for.rb

@@ -30,7 +30,7 @@ module Pageflow
             type = value ? types.first : types.last
 
             if type
-              status_tag(status, type, class: name.to_s.gsub(/\?$/, ''), label: text)
+              status_tag(status, class: [type, name.to_s.gsub(/\?$/, '')].join(' '), label: text)
             else
               text
             end

data/lib/pageflow/built_in_widget_type.rb

@@ -31,13 +31,5 @@ module Pageflow
     def self.slim_player_controls
       new('slim_player_controls', ['player_controls'], 'pageflow/widgets/placeholder')
     end
-
-    def self.cookie_notice_bar
-      Pageflow::React.create_widget_type('cookie_notice_bar', 'cookie_notice')
-    end
-
-    def self.unmute_button
-      Pageflow::React.create_widget_type('unmute_button', 'background_media_control')
-    end
   end
 end

data/lib/pageflow/built_in_widget_types_plugin.rb

@@ -5,8 +5,6 @@ module Pageflow
       config.widget_types.register(Pageflow::BuiltInWidgetType.mobile_navigation, default: true)
       config.widget_types.register(Pageflow::BuiltInWidgetType.slim_player_controls)
       config.widget_types.register(Pageflow::BuiltInWidgetType.classic_player_controls, default: true)
-      config.widget_types.register(Pageflow::BuiltInWidgetType.cookie_notice_bar)
-      config.widget_types.register(Pageflow::BuiltInWidgetType.unmute_button, default: true)
     end
   end
 end

data/lib/pageflow/configuration.rb

@@ -155,15 +155,6 @@ module Pageflow
     #     end
     attr_accessor :public_entry_request_scope
 
-    # Either a lambda or an object with a `call` method taking an
-    # {Entry} record and an {ActionDispatch::Request} object and
-    # returning `nil` or a path to redirect to. Can be used in
-    # conjuction with {PrimaryDomainEntryRedirect} to make sure
-    # entries are accessed via their account's configured cname.
-    #
-    # @since 12.4
-    attr_accessor :public_entry_redirect
-
     # Either a lambda or an object with a `call` method taking a
     # {Theming} as paramater and returing a hash of options used to
     # construct the url of a published entry.
@@ -324,7 +315,6 @@ module Pageflow
 
       @theming_request_scope = CnameThemingRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
-      @public_entry_redirect = ->(_entry, _request) { nil }
       @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 

data/lib/pageflow/engine.rb

@@ -11,12 +11,11 @@ require 'htmlentities'
 require 'kramdown'
 require 'react-rails'
 
-require 'resque_mailer'
-require 'resque_scheduler'
-
 require 'active_admin'
 require 'activeadmin-searchable_select'
 
+require 'bourbon'
+require 'jquery-ui-rails'
 require 'jquery-layout-rails'
 require 'backbone-rails'
 require 'marionette-rails'
@@ -54,9 +53,6 @@ module Pageflow
       I18n.default_locale = :en
       config.i18n.load_path += Dir[Engine.root.join('config', 'locales', '**', '*.yml').to_s]
       config.i18n.locale = :en
-      # bypasses rails bug with i18n in production
-      I18n.reload!
-      config.i18n.reload!
     end
 
     # Make sure the configuration is recreated when classes are
@@ -66,9 +62,9 @@ module Pageflow
       Pageflow.configure!
     end
 
-    initializer "pageflow.factories", :after => "factory_girl.set_factory_paths" do
-      if Pageflow.configured? && defined?(FactoryGirl)
-        FactoryGirl.definition_file_paths.unshift(Engine.root.join('spec', 'factories'))
+    initializer 'pageflow.factories', after: 'factory_bot.set_factory_paths' do
+      if Pageflow.configured? && defined?(FactoryBot)
+        FactoryBot.definition_file_paths.unshift(Engine.root.join('spec', 'factories'))
       end
     end
 

data/lib/pageflow/user_mixin.rb

@@ -64,6 +64,11 @@ module Pageflow
       end
     end
 
+    # Configure devise to send emails using ActiveJob.
+    def send_devise_notification(notification, *args)
+      devise_mailer.send(notification, self, *args).deliver_later
+    end
+
     private
 
     def needs_password?(attributes)

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.6.0'.freeze
+  VERSION = '13.0.0.beta1'.freeze
 end

data/lib/tasks/pageflow_tasks.rake

@@ -8,17 +8,7 @@ namespace :pageflow do
   namespace :node_package do
     desc 'Build node package'
     task :build do
-      system('bin/npm ci && bin/npm run build')
-    end
-  end
-
-  namespace :release do
-    task :pageflow_support do
-      Dir.chdir('spec/support') do
-        puts '=== Releasing pageflow-support ==='
-        system('bundle exec rake release')
-        puts '==='
-      end
+      system('bin/npm run build')
     end
   end
 

data/spec/factories/accounts.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :account, class: Pageflow::Account do
     name 'Account Name'
 

data/spec/factories/audio_files.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :audio_file, :class => AudioFile do
       entry
       uploader { create(:user) }

data/spec/factories/chapters.rb

@@ -1,7 +1,5 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :chapter, :class => Chapter do
       storyline
 

data/spec/factories/edit_locks.rb

@@ -1,9 +1,7 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :edit_lock, :class => EditLock do
-      user nil
+      user { build(:user) }
       entry { build(:entry) }
       updated_at { Time.now }
     end

data/spec/factories/entries.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     sequence :title do |n|
       "Entry #{n}"
     end

data/spec/factories/feature_targets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :feature_target, parent: :account do
   end
 end

data/spec/factories/file_usages.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :file_usage, :class => FileUsage do
       revision nil
       file nil

data/spec/factories/folders.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :folder, :class => Folder do
       name "some folder"
       account

data/spec/factories/hosted_files.rb

@@ -1,11 +1,11 @@
 module Pageflow
-  FactoryGirl.define do
-    hosted_file_model = Class.new(ActiveRecord::Base) do
-      self.table_name = 'test_hosted_files'
-      include HostedFile
-    end
+  class TestHostedFile < ActiveRecord::Base
+    self.table_name = 'test_hosted_files'
+    include HostedFile
+  end
 
-    factory :hosted_file, class: hosted_file_model do
+  FactoryBot.define do
+    factory :hosted_file, class: TestHostedFile do
       trait :on_filesystem do
         attachment_on_filesystem File.open(Engine.root.join('spec', 'fixtures', 'image.png'))
         attachment_on_s3 nil

data/spec/factories/image_files.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :image_file, :class => ImageFile do
       entry
       uploader { create(:user) }

data/spec/factories/invited_user.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :invited_user, class: InvitedUser do
       email
       first_name 'Edison'

data/spec/factories/memberships.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :membership, class: Membership do
       user
       association :entity, factory: :entry

data/spec/factories/pages.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :page, :class => Page do
       chapter
       template "background_image"

data/spec/factories/revisions.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :revision, :class => Revision do
       entry
 

data/spec/factories/storylines.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :storyline, class: Storyline do
       revision
     end

data/spec/factories/text_track_files.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :text_track_file, class: TextTrackFile do
       entry
       uploader { create(:user) }

data/spec/factories/themings.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :theming, :class => Pageflow::Theming do
       account
       theme_name 'default'

data/spec/factories/users.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     sequence :email do |n|
       "person#{n}@example.com"
     end

data/spec/factories/video_files.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  FactoryGirl.define do
+  FactoryBot.define do
     factory :video_file, :class => VideoFile do
       entry
       uploader { create(:user) }

data/spec/factories/widgets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :widget, :class => Pageflow::Widget do
     role 'navigation'
     type_name 'test_widget'

data/vendor/assets/javascripts/audio5.min.js

@@ -4,9 +4,9 @@
  * License MIT (c) Zohar Arad 2013
  */
 (function ($win, ns, factory) {
-  "use strict";
   /*global define */
   /*global swfobject */
+  "use strict";
 
   if (typeof (module) !== 'undefined' && module.exports) { // CommonJS
     module.exports = factory(ns, $win);
@@ -134,35 +134,17 @@
     trigger: function (evt) {
       if (this.channels && this.channels.hasOwnProperty(evt)) {
         var args = Array.prototype.slice.call(arguments, 1);
-
-        // temp array to store all subscribers for the channel evt that must be stored in state
-        var evtSubscribers = [];
-        // temp array to store all subscribers for the channel evt that is being triggered that must be executed.
-        var evtSubscribersForExec = [];
-
+        var a = [];
         while(this.channels[evt].length > 0) {
           var sub = this.channels[evt].shift();
-
-          if ( !sub.once ){
-            // for any channel event triggers that are not marked as once only, we need to keep.
-            evtSubscribers.push(sub);
-          }
-
-          // if we have a function with the channel subscription, store in temp array ready to call after all proceeded
           if (typeof (sub.fn) === 'function') {
-            // every subscriber we've processed will be executed
-            evtSubscribersForExec.push(sub);
+            sub.fn.apply(sub.ctx, args);
+          }
+          if ( !sub.once ){
+            a.push(sub);
           }
         }
-
-        // before we execute any of the subscribers to the trigger, we must make sure keep this.channels[evt] up to date in case any sub fns call off
-        this.channels[evt] = evtSubscribers;
-
-        // run all the event subscribers that need executing
-        while(evtSubscribersForExec.length > 0) {
-          var eventSub = evtSubscribersForExec.shift();
-          eventSub.fn.apply(eventSub.ctx, args);
-        }
+        this.channels[evt] = a;
       }
     }
   };
@@ -171,21 +153,19 @@
     /**
      * Flash embed code string with cross-browser support.
      */
-  flash_embed_code: function (id, swf_location, ts) {
+    flash_embed_code: (function () {
       var prefix;
-      var elemId = ns + id;
-      var s = '<param name="movie" value="' + swf_location + '?playerInstanceNumber=' + id + '&datetime=' + ts + '"/>' +
+      var s = '<param name="movie" value="$2?playerInstance=window.' + ns + '_flash.instances[\'$1\']&datetime=$3"/>' +
         '<param name="wmode" value="transparent"/>' +
         '<param name="allowscriptaccess" value="always" />' +
         '</object>';
       if (ActiveXObject) {
-        prefix = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="1" height="1" id="' + elemId + '">';
+        prefix = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="1" height="1" id="$1">';
       } else {
-        prefix = '<object type="application/x-shockwave-flash" data="' + swf_location + '?playerInstanceNumber=' + id + '&datetime=' + ts + '" width="1" height="1" id="' + elemId + '" >';
+        prefix = '<object type="application/x-shockwave-flash" data="$2?playerInstance=window.' + ns + '_flash.instances[\'$1\']&datetime=$3" width="1" height="1" id="$1" >';
       }
-
       return prefix + s;
-    },
+    }()),
     /**
      * Check if browser supports audio mime type.
      * @param {String} mime_type audio mime type to check
@@ -195,36 +175,30 @@
       var a = document.createElement('audio');
       var mime_str;
       switch (mime_type) {
-        case 'mp3':
-          mime_str = 'audio/mpeg;';
-          break;
-        case 'vorbis':
-          mime_str = 'audio/ogg; codecs="vorbis"';
-          break;
-        case 'opus':
-          mime_str = 'audio/ogg; codecs="opus"';
-          break;
-        case 'webm':
-          mime_str = 'audio/webm; codecs="vorbis"';
-          break;
-        case 'mp4':
-          mime_str = 'audio/mp4; codecs="mp4a.40.5"';
-          break;
-        case 'wav':
-          mime_str = 'audio/wav; codecs="1"';
-          break;
-      }
-      if (mime_str !== undefined) {
-        if (mime_type === 'mp3' && navigator.userAgent.match(/Android/i) && navigator.userAgent.match(/Firefox/i)) {
-          return true;
-        }
-        try {
-          return !!a.canPlayType && a.canPlayType(mime_str) !== '';
-        } catch (e) {
-          return false;
-        }
+      case 'mp3':
+        mime_str = 'audio/mpeg; codecs="mp3"';
+        break;
+      case 'vorbis':
+        mime_str = 'audio/ogg; codecs="vorbis"';
+        break;
+      case 'opus':
+        mime_str = 'audio/ogg; codecs="opus"';
+        break;
+      case 'webm':
+        mime_str = 'audio/webm; codecs="vorbis"';
+        break;
+      case 'mp4':
+        mime_str = 'audio/mp4; codecs="mp4a.40.5"';
+        break;
+      case 'wav':
+        mime_str = 'audio/wav; codecs="1"';
+        break;
+      }
+      if (mime_str === undefined) {
+        throw new Error('Unspecified Audio Mime Type');
+      } else {
+        return !!a.canPlayType && a.canPlayType(mime_str) !== '';
       }
-      return false;
     },
     /**
      * Boolean flag indicating whether the browser has Flash installed or not
@@ -258,17 +232,19 @@
       document.body.appendChild(d);
       if(typeof($win.swfobject) === 'object'){
         var fv = {
-          playerInstance: 'window.'+ ns + '_flash.instances[\''+id+'\']'
+          playerInstance: 'window.'+ ns + '_flash.instances["'+id+'"]'
         };
         var params = {
           allowscriptaccess: 'always',
           wmode: 'transparent'
         };
-        d.innerHTML = '<div id="'+ ns + id +'"></div>';
-        swfobject.embedSWF(swf_location + '?ts='+(new Date().getTime() + Math.random()), ns + id, "1", "1", "9.0.0", null, fv, params);
+        d.innerHTML = '<div id="'+id+'"></div>';
+        swfobject.embedSWF(swf_location + '?ts='+(new Date().getTime() + Math.random()), id, "1", "1", "9.0.0", null, fv, params);
       } else {
-        var ts = new Date().getTime() + Math.random(); // Ensure swf is not pulled from cache
-        d.innerHTML = this.flash_embed_code(id, swf_location, ts);
+        var flashSource = this.flash_embed_code.replace(/\$1/g, id);
+        flashSource = flashSource.replace(/\$2/g, swf_location);
+        flashSource = flashSource.replace(/\$3/g, (new Date().getTime() + Math.random())); // Ensure swf is not pulled from cache
+        d.innerHTML = flashSource;
       }
       return document.getElementById(id);
     },
@@ -305,7 +281,7 @@
     duration: 0, /** {Float} audio duration (sec) */
     position: 0, /** {Float} audio position (sec) */
     load_percent: 0, /** {Float} audio file load percent (%) */
-    seekable: false, /** {Boolean} is loaded audio seekable */
+    seekable: null, /** {Boolean} is loaded audio seekable */
     ready: null /** {Boolean} is loaded audio seekable */
   };
 
@@ -315,7 +291,8 @@
    * @type {Object}
    */
   var globalAudio5Flash = $win[ns + '_flash'] = $win[ns + '_flash'] || {
-    instances: [] /** FlashAudioPlayer instance hash */
+    instances: { }, /** FlashAudioPlayer instance hash */
+    count: 0 /** FlashAudioPlayer instance count */
   };
 
   /**
@@ -334,8 +311,9 @@
      * @param {String} swf_src path to audio player SWF file
      */
     init: function (swf_src) {
-      globalAudio5Flash.instances.push(this);
-      this.id = globalAudio5Flash.instances.length - 1;
+      globalAudio5Flash.count += 1;
+      this.id = ns + globalAudio5Flash.count;
+      globalAudio5Flash.instances[this.id] = this;
       this.embed(swf_src);
     },
     /**
@@ -349,7 +327,7 @@
      * ExternalInterface callback indicating SWF is ready
      */
     eiReady: function () {
-      this.audio = document.getElementById(ns + this.id);
+      this.audio = document.getElementById(this.id);
       this.trigger('ready');
     },
     /**
@@ -385,13 +363,9 @@
     /**
      * ExternalInterface download progress callback. Fires as long as audio file is downloaded by browser.
      * @param {Float} percent audio download percent
-     * @param {Float} duration audio total duration (sec)
-     * * @param {Boolean} seekable is audio seekable or not (download or streaming)
      */
-    eiProgress: function (percent, duration, seekable) {
+    eiProgress: function (percent) {
       this.load_percent = percent;
-      this.duration = duration;
-      this.seekable = seekable;
       this.trigger('progress', percent);
     },
     /**
@@ -407,7 +381,6 @@
     eiPlay: function () {
       this.playing = true;
       this.trigger('play');
-      this.trigger('playing');
     },
     /**
      * ExternalInterface audio pause callback. Fires when audio is paused.
@@ -420,7 +393,7 @@
      * ExternalInterface audio ended callback. Fires when audio playback ended.
      */
     eiEnded: function () {
-      this.pause();
+      this.playing = false;
       this.trigger('ended');
     },
     /**
@@ -486,24 +459,6 @@
         this.audio.seekTo(position);
         this.position = position;
       } catch (e) {}
-    },
-    /**
-     * This feature was not implemented for Flash
-     */
-    rate: function () {
-      // Not implemented
-    },
-    /**
-     * Destroy audio object and remove from DOM
-     */
-    destroyAudio: function() {
-      if(this.audio){
-        this.pause();
-        this.audio.parentNode.removeChild(this.audio);
-        delete globalAudio5Flash.instances[this.id];
-        globalAudio5Flash.instances.splice(this.id, 1);
-        delete this.audio;
-      }
     }
   };
 
@@ -520,91 +475,52 @@
     /**
      * Initialize the player instance
      */
-    init: function () {
-      this._rate = 1;
+    init: function (reusedTag) {
+      this.reusedTag = reusedTag;
       this.trigger('ready');
     },
-    /**
-     * Create new audio instance
-     */
     createAudio: function(){
-      this.audio = new Audio();
+      this.audio = this.reusedTag || new Audio();
       this.audio.autoplay = false;
       this.audio.preload = 'auto';
       this.audio.autobuffer = true;
-      this.audio.playbackRate = this._rate;
 
       this.audio.setAttribute('crossorigin', 'anonymous');
 
       this.bindEvents();
     },
-    /**
-     * Destroy current audio instance
-     */
     destroyAudio: function(){
       if(this.audio){
-        this.pause();
         this.unbindEvents();
-        try {
-          this.audio.setAttribute('src', '');
-        } finally {
-          delete this.audio;
-        }
+        delete this.audio;
       }
     },
-    /**
-     * Sets up audio event listeners once so adding / removing event listeners is always done
-     * on the same callbacks.
-     */
-    setupEventListeners: function(){
-      this.listeners = {
-        loadstart: this.onLoadStart.bind(this),
-        canplay: this.onLoad.bind(this),
-        loadedmetadata: this.onLoadedMetadata.bind(this),
-        play: this.onPlay.bind(this),
-        playing: this.onPlaying.bind(this),
-        pause: this.onPause.bind(this),
-        ended: this.onEnded.bind(this),
-        error: this.onError.bind(this),
-        timeupdate: this.onTimeUpdate.bind(this),
-        seeking: this.onSeeking.bind(this),
-        seeked: this.onSeeked.bind(this)
-      };
-    },
     /**
      * Bind DOM events to Audio object
      */
-    bindEvents: function() {
-      if(this.listeners === undefined){
-        this.setupEventListeners();
-      }
-      this.audio.addEventListener('loadstart', this.listeners.loadstart, false);
-      this.audio.addEventListener('canplay', this.listeners.canplay, false);
-      this.audio.addEventListener('loadedmetadata', this.listeners.loadedmetadata, false);
-      this.audio.addEventListener('play', this.listeners.play, false);
-      this.audio.addEventListener('playing', this.listeners.playing, false);
-      this.audio.addEventListener('pause', this.listeners.pause, false);
-      this.audio.addEventListener('ended', this.listeners.ended, false);
-      this.audio.addEventListener('error', this.listeners.error, false);
-      this.audio.addEventListener('timeupdate', this.listeners.timeupdate, false);
-      this.audio.addEventListener('seeking', this.listeners.seeking, false);
-      this.audio.addEventListener('seeked', this.listeners.seeked, false);
-    },
-    /**
-     * Unbind DOM events from Audio object
-     */
-    unbindEvents: function() {
-      this.audio.removeEventListener('loadstart', this.listeners.loadstart);
-      this.audio.removeEventListener('canplay', this.listeners.canplay);
-      this.audio.removeEventListener('loadedmetadata', this.listeners.loadedmetadata);
-      this.audio.removeEventListener('play', this.listeners.play);
-      this.audio.removeEventListener('playing', this.listeners.playing);
-      this.audio.removeEventListener('pause', this.listeners.pause);
-      this.audio.removeEventListener('ended', this.listeners.ended);
-      this.audio.removeEventListener('error', this.listeners.error);
-      this.audio.removeEventListener('timeupdate', this.listeners.timeupdate);
-      this.audio.removeEventListener('seeking', this.listeners.seeking);
-      this.audio.removeEventListener('seeked', this.listeners.seeked);
+    bindEvents: function () {
+      this.audio.addEventListener('loadstart', this.onLoadStart.bind(this));
+      this.audio.addEventListener('canplay', this.onLoad.bind(this));
+      this.audio.addEventListener('loadedmetadata', this.onLoadedMetadata.bind(this));
+      this.audio.addEventListener('playing', this.onPlay.bind(this));
+      this.audio.addEventListener('pause', this.onPause.bind(this));
+      this.audio.addEventListener('ended', this.onEnded.bind(this));
+      this.audio.addEventListener('error', this.onError.bind(this));
+      this.audio.addEventListener('timeupdate', this.onTimeUpdate.bind(this));
+      this.audio.addEventListener('seeking', this.onSeeking.bind(this));
+      this.audio.addEventListener('seeked', this.onSeeked.bind(this));
+    },
+    unbindEvents: function(){
+      this.audio.removeEventListener('loadstart', this.onLoadStart.bind(this));
+      this.audio.removeEventListener('canplay', this.onLoad.bind(this));
+      this.audio.removeEventListener('loadedmetadata', this.onLoadedMetadata.bind(this));
+      this.audio.removeEventListener('playing', this.onPlay.bind(this));
+      this.audio.removeEventListener('pause', this.onPause.bind(this));
+      this.audio.removeEventListener('ended', this.onEnded.bind(this));
+      this.audio.removeEventListener('error', this.onError.bind(this));
+      this.audio.removeEventListener('timeupdate', this.onTimeUpdate.bind(this));
+      this.audio.removeEventListener('seeking', this.onSeeking.bind(this));
+      this.audio.removeEventListener('seeked', this.onSeeked.bind(this));
     },
     /**
      * Audio load start event handler. Triggered when audio starts loading
@@ -617,9 +533,6 @@
      * Resets player parameters and starts audio download progress timer.
      */
     onLoad: function () {
-      if(!this.audio){
-        return setTimeout(this.onLoad.bind(this), 100);
-      }
       this.seekable = this.audio.seekable && this.audio.seekable.length > 0;
       if (this.seekable) {
         this.timer = setInterval(this.onProgress.bind(this), 250);
@@ -636,21 +549,12 @@
      * Audio play event handler. Triggered when audio starts playing.
      */
     onPlay: function () {
-      this.playing = true;
       this.trigger('play');
     },
-    /**
-     * Audio play event handler. Triggered when audio starts playing.
-     */
-    onPlaying: function () {
-      this.playing = true;
-      this.trigger('playing');
-    },
     /**
      * Audio pause event handler. Triggered when audio is paused.
      */
     onPause: function () {
-      this.playing = false;
       this.trigger('pause');
     },
     /**
@@ -664,11 +568,9 @@
      * Audio timeupdate event handler. Triggered as long as playhead position is updated (audio is being played).
      */
     onTimeUpdate: function () {
-      if (this.audio && this.playing) {
-        try{
-          this.position = this.audio.currentTime;
-          this.duration = this.audio.duration === Infinity ? null : this.audio.duration;
-        } catch (e){}
+      if (this.audio.buffered !== null && this.playing) {
+        this.position = this.audio.currentTime;
+        this.duration = this.audio.duration === Infinity ? null : this.audio.duration;
         this.trigger('timeupdate', this.position, this.duration);
       }
     },
@@ -678,9 +580,8 @@
      * Cancelled when audio has fully download or when a new audio file has been loaded to the player.
      */
     onProgress: function () {
-      if (this.audio && this.audio.buffered !== null && this.audio.buffered.length) {
-        this.duration = this.audio.duration === Infinity ? null : this.audio.duration;
-        this.load_percent = parseInt(((this.audio.buffered.end(this.audio.buffered.length - 1) / this.duration) * 100), 10);
+      if (this.audio.buffered !== null) {
+        this.load_percent = parseInt(((this.audio.buffered.end(this.audio.buffered.length - 1) / this.audio.duration) * 100), 10);
         this.trigger('progress', this.load_percent);
         if (this.load_percent >= 100) {
           this.clearLoadProgress();
@@ -731,11 +632,8 @@
      */
     load: function (url) {
       this.reset();
-      this.trigger('pause');
-      //this.destroyAudio();
-      if(this.audio === undefined){
-        this.createAudio();
-      }
+      this.destroyAudio();
+      this.createAudio();
       this.audio.setAttribute('src', url);
       this.audio.load();
     },
@@ -743,19 +641,15 @@
      * Play audio
      */
     play: function () {
-      if(this.audio) {
-        var playPromise = this.audio.play();
-        this.audio.playbackRate = this._rate;
-        return playPromise;
-      }
+      this.playing = true;
+      this.audio.play();
     },
     /**
      * Pause audio
      */
     pause: function () {
-      if(this.audio) {
-        this.audio.pause();
-      }
+      this.playing = false;
+      this.audio.pause();
     },
     /**
      * Get / Set audio volume
@@ -782,23 +676,10 @@
       if (playing) {
         this.play();
       } else {
-        if (this.audio.buffered !== null && this.audio.buffered.length) {
+        if (this.audio.buffered !== null) {
           this.trigger('timeupdate', this.position, this.duration);
         }
       }
-    },
-    /**
-     * Define the playback rate
-     * @param {Float} v playback rate value to be set
-     */
-    rate: function (v) {
-      if (v === undefined || isNaN(parseFloat(v))) {
-        return this._rate;
-      }
-      this._rate = v;
-      if (this.audio) {
-          this.audio.playbackRate = v;
-      }
     }
   };
 
@@ -867,7 +748,7 @@
       if (this.settings.use_flash) {
         this.audio.init(s.swf_path);
       } else {
-        this.audio.init();
+        this.audio.init(s.reusedTag);
       }
     },
     /**
@@ -876,36 +757,28 @@
      * @return {FlashAudioPlayer,HTML5AudioPlayer} audio player instance
      */
     getPlayer: function () {
-      var i, l, player, codec;
-      if(this.settings.use_flash){
-        player = new FlashAudioPlayer();
-        this.settings.player = {
-          engine: 'flash',
-          codec: 'mp3'
-        };
-      } else {
-        for (i = 0, l = this.settings.codecs.length; i < l; i++) {
-          codec = this.settings.codecs[i];
-          if (Audio5js.can_play(codec)) {
-            player = new HTML5AudioPlayer();
-            this.settings.use_flash = false;
-            this.settings.player = {
-              engine: 'html',
-              codec: codec
-            };
-            break;
-          }
-        }
-        if (player === undefined) {
-          // here we double check for mp3 support instead of defaulting to Flash in case user overrode the settings.codecs array with an empty array.
-          this.settings.use_flash = !Audio5js.can_play('mp3');
-          player = this.settings.use_flash ? new FlashAudioPlayer() : new HTML5AudioPlayer();
+      var i, l, player;
+      for (i = 0, l = this.settings.codecs.length; i < l; i++) {
+        var codec = this.settings.codecs[i];
+        if (Audio5js.can_play(codec)) {
+          player = new HTML5AudioPlayer();
+          this.settings.use_flash = false;
           this.settings.player = {
-            engine: (this.settings.use_flash ? 'flash' : 'html'),
-            codec: 'mp3'
+            engine: 'html',
+            codec: codec
           };
+          break;
         }
       }
+      if (player === undefined) {
+        // here we double check for mp3 support instead of defaulting to Flash in case user overrode the settings.codecs array with an empty array.
+        this.settings.use_flash = !Audio5js.can_play('mp3');
+        player = this.settings.use_flash ? new FlashAudioPlayer() : new HTML5AudioPlayer();
+        this.settings.player = {
+          engine: (this.settings.use_flash ? 'flash' : 'html'),
+          codec: 'mp3'
+        };
+      }
       return player;
     },
     /**
@@ -925,36 +798,18 @@
       this.audio.on('seeking', this.onSeeking, this);
       this.audio.on('seeked', this.onSeeked, this);
     },
-    /**
-     * Bind events from audio object to internal callbacks
-     */
-    unbindAudioEvents: function () {
-      this.audio.off('ready', this.onReady);
-      this.audio.off('loadstart', this.onLoadStart);
-      this.audio.off('loadedmetadata', this.onLoadedMetadata);
-      this.audio.off('play', this.onPlay);
-      this.audio.off('pause', this.onPause);
-      this.audio.off('ended', this.onEnded);
-      this.audio.off('canplay', this.onCanPlay);
-      this.audio.off('timeupdate', this.onTimeUpdate);
-      this.audio.off('progress', this.onProgress);
-      this.audio.off('error', this.onError);
-      this.audio.off('seeking', this.onSeeking);
-      this.audio.off('seeked', this.onSeeked);
-    },
     /**
      * Load audio from URL
      * @param {String} url URL of audio to load
      */
     load: function (url) {
-      var that = this;
       var f = function(u){
-        that.audio.load(u);
-        that.trigger('load');
-      };
+        this.audio.load(u);
+        this.trigger('load');
+      }.bind(this, url);
 
       if(this.ready){
-        f(url);
+        f();
       } else {
         this.on('ready', f);
       }
@@ -964,7 +819,8 @@
      */
     play: function () {
       if(!this.playing){
-        return this.audio.play();
+        this.playing = true;
+        this.audio.play();
       }
     },
     /**
@@ -972,6 +828,7 @@
      */
     pause: function () {
       if(this.playing){
+        this.playing = false;
         this.audio.pause();
       }
     },
@@ -1002,20 +859,6 @@
       this.audio.seek(position);
       this.position = position;
     },
-    /**
-     * Define the playback rate
-     * @param {Float} value playback rate value to be set
-     */
-    rate: function (value) {
-        return this.audio.rate(value);
-    },
-    /**
-     * Destroy audio object and remove from DOM
-     */
-    destroy: function() {
-      this.unbindAudioEvents();
-      this.audio.destroyAudio();
-    },
     /**
      * Callback for audio ready event. Indicates audio is ready for playback.
      * Looks for ready callback in settings object and invokes it in the context of player instance
@@ -1043,22 +886,27 @@
      * Audio play event handler
      */
     onPlay: function () {
-      this.playing = true;
       this.trigger('play');
     },
     /**
      * Audio pause event handler
      */
     onPause: function () {
-      this.playing = false;
       this.trigger('pause');
     },
     /**
      * Playback end event handler
      */
     onEnded: function () {
-      this.playing = false;
-      this.trigger('ended');
+      var wasPlaying = this.playing;
+
+      if (this.settings.loop && wasPlaying) {
+        this.audio.play();
+      }
+      else {
+        this.playing = false;
+        this.trigger('ended');
+      }
     },
     /**
      * Audio error event handler
@@ -1096,7 +944,9 @@
      */
     onTimeUpdate: function (position, duration) {
       this.position = this.settings.format_time ? util.formatTime(position) : position;
-      this.duration = this.settings.format_time && duration !== null ? util.formatTime(duration) : duration;
+      if (this.duration !== duration) {
+        this.duration = this.settings.format_time && duration !== null ? util.formatTime(duration) : duration;
+      }
       this.trigger('timeupdate', this.position, this.duration);
     },
     /**
@@ -1104,7 +954,6 @@
      * @param {Float} loaded audio download percent
      */
     onProgress: function (loaded) {
-      this.duration = this.audio.duration;
       this.load_percent = loaded;
       this.trigger('progress', loaded);
     }
@@ -1115,4 +964,4 @@
 
   return Audio5js;
 
-}));
+}));