videojs_rails 4.12.5 → 4.12.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f9232ee43e7982e17d42a390b44605495f6c43
-  data.tar.gz: 3b717ca17be9e535d555016464d14a4bc30a807e
+  metadata.gz: eb92eacedf89b4ae3d2540561bb437036043e1bf
+  data.tar.gz: a982d5cbf412773b0607d1614eeb4f6cb3d0ce23
 SHA512:
-  metadata.gz: 4c8e29bb0dd3a6cbdd2ecb31e8d86fb1bb5a2a517b7c927feb1d24525adac5048ef57b51902ba8a18b1d1873dc9b68a352be3691083f2b573bfb444493d98d5f
-  data.tar.gz: d2e9f57db429627fadc13675c24458113322ce8f295bee3678ecda192279a1032ad51e9bf9d4ba664a55697bc11d6965c5b3a1fefb146fcf8aebd949ac26b0a2
+  metadata.gz: 023cd67d03a51549036b87bb4490f05b53c8659f0c033e53f35cd43d536da63e80b9b2d29f6e4ba65e448aea71cc372fb4fe88b5a61cfb90a418193d73e54f3f
+  data.tar.gz: 9a74891f2c1183aa2db23785cf62f49e7bf9d6cbfcd7fbec0059a6442b08cf6a003ac88e4048ad45882112bbb3d6e13c240155b34a37941a523ca31c1d72aeb6

data/lib/videojs_rails/version.rb

@@ -1,3 +1,3 @@
 module VideojsRails
-  VERSION = '4.12.5'
+  VERSION = '4.12.6.1'
 end

data/lib/videojs_rails/view_helpers.rb

@@ -1,12 +1,72 @@
 module VideojsRails
   module ViewHelpers
-    def videojs_rails(*options, &blk)
-      default_options = {
+      DEFAULT_OPTIONS = {
         controls: true,
-        preload: "auto"
+        preload: :auto
+      }.freeze
+
+    def videojs_rails(user_options, &blk)
+      sources, captions, options = prepare_options(user_options)
+      generate_tag(options, sources, captions, &blk)
+    end
+
+    private
+
+    def prepare_options(user_options)
+      options = DEFAULT_OPTIONS.merge(user_options)
+      options[:'data-setup'] = options.delete(:setup) if options.key?(:setup)
+      options[:class] = [options[:class], "video-js vjs-default-skin"].join(' ')
+
+      [options.delete(:sources), options.delete(:captions), options]
+    end
+
+    def generate_sources(sources)
+      return if sources.blank?
+      sources.each do |type, source|
+        concat tag(:source, src: source, type: "video/#{ type }")
+      end
+    end
+
+    def generate_captions(captions, options)
+      return if captions.blank?
+      captions.each do |lang, caption|
+        src, label = extract_caption_information(caption)
+        caption_options = prepare_caption_options(src, lang, label, options)
+
+        concat tag(:track, caption_options)
+      end
+    end
+
+    def extract_caption_information(caption)
+      if caption.is_a?(Hash)
+        caption.values_at(:src, :label)
+      else
+        caption
+      end
+    end
+
+    def prepare_caption_options(src, lang, label, options)
+      default_caption_language = options[:default_caption_language].try(:to_sym)
+      {
+        kind: :captions,
+        src: src,
+        srclang: lang,
+        label: label,
+        default: default_caption_language == lang.to_sym
       }
-      options = default_options.merge(options.extract_options!)
-      render partial: 'videojs_rails/videojs_rails', locals: { options: options }, &blk
+    end
+
+    def generate_tag(options, sources, captions, &blk)
+      content_tag(:video, options) do
+        generate_sources(sources)
+        generate_captions(captions, options)
+        generate_no_js(&blk)
+      end
+    end
+
+    def generate_no_js
+      return unless block_given?
+      concat content_tag(:p, yield, class: :'vjs-no-js')
     end
   end
 end

data/vendor/assets/javascripts/video.js.erb

@@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
 * Full player version
 * @type {string}
 */
-vjs['VERSION'] = '4.12.5';
+vjs['VERSION'] = '4.12.6';
 
 /**
  * Global Player instance options, surfaced from vjs.Player.prototype.options_
@@ -7774,12 +7774,6 @@ vjs.Flash = vjs.MediaTechController.extend({
 
     var source = options['source'],
 
-        // Which element to embed in
-        parentEl = options['parentEl'],
-
-        // Create a temporary element to be replaced by swf object
-        placeHolder = this.el_ = vjs.createEl('div', { id: player.id() + '_temp_flash' }),
-
         // Generate ID for swf object
         objId = player.id()+'_flash_api',
 
@@ -7826,7 +7820,7 @@ vjs.Flash = vjs.MediaTechController.extend({
     }
 
     // Add placeholder to player div
-    vjs.insertFirst(placeHolder, parentEl);
+    vjs.insertFirst(this.el_, options['parentEl']);
 
     // Having issues with Flash reloading on certain page actions (hide/resize/fullscreen) in certain browsers
     // This allows resetting the playhead when we catch the reload
@@ -7853,7 +7847,7 @@ vjs.Flash = vjs.MediaTechController.extend({
     // use stageclick events triggered from inside the SWF instead
     player.on('stageclick', player.reportUserActivity);
 
-    this.el_ = vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes);
+    this.el_ = vjs.Flash.embed(options['swf'], this.el_, flashVars, params, attributes);
   }
 });
 
@@ -8120,6 +8114,7 @@ vjs.Flash.embed = function(swf, placeHolder, flashVars, params, attributes){
   ;
 
   placeHolder.parentNode.replaceChild(obj, placeHolder);
+  obj[vjs.expando] = placeHolder[vjs.expando];
 
   // IE6 seems to have an issue where it won't initialize the swf object after injecting it.
   // This is a dumb fix

data/vendor/assets/stylesheets/video-js.css.erb

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.12.5
+Version 4.12.6
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videojs_rails
 version: !ruby/object:Gem::Version
-  version: 4.12.5
+  version: 4.12.6.1
 platform: ruby
 authors:
 - Sean Behan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies: []
 description: HTML5 VideoJS plugin
 email:
@@ -20,7 +20,6 @@ files:
 - ".gitignore"
 - Gemfile
 - Rakefile
-- app/views/videojs_rails/_videojs_rails.html.erb
 - lib/videojs_rails.rb
 - lib/videojs_rails/engine.rb
 - lib/videojs_rails/railtie.rb

data/app/views/videojs_rails/_videojs_rails.html.erb

@@ -1,33 +0,0 @@
-<%= content_tag(:video,
-  id: options[:id],
-  class: "#{ options[:classes] } vide-js vjs-default-skin",
-  controls: options[:controls],
-  loop: options[:loop],
-  autoplay: options[:autoplay],
-  preload: options[:preload],
-  width: options[:width],
-  height: options[:height],
-  poster: options[:poster],
-  'data-setup' => options[:setup]) do 
-    if options[:sources]
-      options[:sources].each do |type, source|
-        concat tag(:source, src: source, type: "video/#{ type }")
-      end
-    end
-
-    if options[:captions]
-      options[:captions].each do |lang, caption|
-        if caption.is_a?(Hash)
-          caption_src = caption[:src]
-          caption_label = caption[:label]
-        else
-          caption_src = caption
-        end
-
-        concat tag(:track, kind: :captions, src: caption_src, srclang: lang, label: caption_label, default: (options[:default_caption_language].present? && options[:default_caption_language].to_sym == lang.to_sym))
-      end
-    end
-
-    concat content_tag(:p, class: 'vjs-no-js') { yield }
-  end
-%>