pageflow-embedded-video 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74fecff08bbcca780ac0a4ac6ef8a4809abed33
-  data.tar.gz: ced938c2f292a28da4c4a267250605bfceee1157
+  metadata.gz: 9ab2a126175d3b53e98841097cd3b40da61ef743
+  data.tar.gz: 3421f5e51c631fa53d22b83d7c6480ccf5262ced
 SHA512:
-  metadata.gz: d40e22b826db14367d0006ca97db485a01a9fec800c321f5527f298347d4d3c512a44405e6e4b20f585f3df9640c7cadfffab658f7c2aebfe28734b220e3fd0f
-  data.tar.gz: d0f0ba3e8c68743122898339fd80403a6ac25cba83a016914a70cf7524a29e6236a3b862341921874e4dcc82f025c12e1ab860d98405e88345ea847bb9ce3ffe
+  metadata.gz: 4a1f9a124ccbf200f36a485a13731213c056d0859be57c13369611325bb1796b17c1052ab0edb86a8d2f3ac479173c1f10f63aed04a477a36104ac9589931e32
+  data.tar.gz: c7ff2e8a5b96b0b07e923319047e3fb48e6703801a321788c64429a0d55d06d6fd7204da1e7a0ef05a652f1208debb9768188627fefd0f60a6e895d1dc562998

data/CHANGELOG.md

@@ -1,12 +1,15 @@
 # CHANGELOG
 
-### Version 0.2.1
+### Version 0.3.0
 
-2016-06-09
+2016-09-09
 
-[Compare changes](https://github.com/codevise/pageflow-embedded-video/compare/v0.2.0...v0.2.1)
+[Compare changes](https://github.com/codevise/pageflow-embedded-video/compare/v0.2.0...v0.3.0)
 
-- Do not depend on pre version of pageflow.
+- Allow youtube urls with timecode
+  ([#14](https://github.com/codevise/pageflow-embedded-video/pull/14))
+- Align close button with slim player control
+  ([#13](https://github.com/codevise/pageflow-embedded-video/pull/13))
 
 ### Version 0.2.0
 

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in embedded-video.gemspec
 gemspec
-
-gem 'activeadmin', :git => 'https://github.com/codevise/active_admin.git', :branch => 'rails4'
-gem 'ransack'
-gem 'inherited_resources', '1.4.1'
-gem 'formtastic', '2.3.0.rc2'
-

data/README.md

@@ -17,13 +17,13 @@ Register the page type:
 
     # config/initializers/pageflow.rb
     Pageflow.configure do |config|
-      config.register_page_type(Pageflow::EmbeddedVideo.page_type)
+      config.page_types.register(Pageflow::EmbeddedVideo.page_type)
     end
 
 Include javascript/stylesheets:
 
     # app/assets/javascripts/pageflow/application.js
-    //= require "pageflow/embedded_video"
+    //= require pageflow/embedded_video
 
     # app/assets/javascripts/pageflow/editor.js
     //= require pageflow/embedded_video/editor
@@ -39,14 +39,15 @@ Include javascript/stylesheets:
 
 ## Configuration
 
-Configure Pageflow Embedded Video by creating an initializer in your app
+Optionally, configure Pageflow Embedded Video by creating an initializer in your app
 `config/initializers/pageflow_embedded_video.rb`.
 
 Example:
 
     Pageflow::EmbeddedVideo.configure do |config|
       # Remove items to disallow hosts
-      # config.supported_hosts = %w(https://www.youtube.com http://www.youtube.com http://vimeo.com)
+      # The listed hosts are supported by default:
+      # config.supported_hosts = %w(https://www.youtube.com http://www.youtube.com https://vimeo.com http://vimeo.com)
     end
 
 ## Troubleshooting

data/app/assets/javascript/pageflow/embedded_video/page_type.js

@@ -12,7 +12,7 @@ pageflow.pageType.register('embedded_video', _.extend({
       pageElement.find('.close_button, .iframe_container').click(function(event) {
         event.stopPropagation();
         that._pauseVideo();
-        pageElement.find('.iframe_container').removeClass('show');
+        pageElement.find('.iframe_container, .close_button').removeClass('show');
         pageflow.hideText.deactivate();
       });
 
@@ -125,13 +125,7 @@ pageflow.pageType.register('embedded_video', _.extend({
     }
 
     if (this.active) {
-      var currentUrl = this._getCurrentUrl(pageElement),
-          newUrl = configuration.get('display_embedded_video_url');
-
-      if (this._urlOrigin(currentUrl) === this._urlOrigin(newUrl)) {
-        this._updatePlayerSrc(pageElement, configuration);
-      }
-      else {
+      if (configuration.hasChanged('display_embedded_video_url')) {
         this._removePlayer(pageElement, function() {
           that._createPlayer(pageElement, configuration.attributes);
         });
@@ -202,7 +196,8 @@ pageflow.pageType.register('embedded_video', _.extend({
         width: '100%',
         videoId: that._getVideoId(url),
         playerVars: {
-          rel: false
+          rel: false,
+          start: that._getVideoStartTime(url)
         },
         events: {
           'onReady': function(event) {
@@ -244,15 +239,6 @@ pageflow.pageType.register('embedded_video', _.extend({
     });
   },
 
-  _updatePlayerSrc: function(pageElement, configuration) {
-    var that = this,
-        newUrl = configuration.get('display_embedded_video_url'),
-        p = pageElement.find('iframe'),
-        url = new URI(p.attr('src'));
-
-    p.attr('src', url.filename(that._getVideoId(newUrl)));
-  },
-
   _setPlayerVolume: function(value) {
     if (this.player) {
       if (typeof this.player.setVolume === 'function') {
@@ -288,7 +274,7 @@ pageflow.pageType.register('embedded_video', _.extend({
   _initPlaceholderImage: function(pageElement, configuration) {
     var $div = $(document.createElement('div')),
       pageHeader = pageElement.find('.page_header'),
-      container = pageElement.find('.iframe_container'),
+      containerAndCloseButton = pageElement.find('.iframe_container, .close_button'),
       url = configuration.display_embedded_video_url;
 
     $div.addClass('iframe_overlay ' + this._urlOrigin(url));
@@ -298,7 +284,7 @@ pageflow.pageType.register('embedded_video', _.extend({
 
     $div.click(function(event) {
       event.preventDefault();
-      container.addClass('show');
+      containerAndCloseButton.addClass('show');
       pageflow.hideText.activate();
     });
   },
@@ -321,10 +307,6 @@ pageflow.pageType.register('embedded_video', _.extend({
     }
   },
 
-  _getCurrentUrl: function(pageElement) {
-    return pageElement.find('iframe').attr('src');
-  },
-
   _urlOrigin: function(url) {
     var uri = new URI(url),
       domain = uri.domain(true);
@@ -358,6 +340,32 @@ pageflow.pageType.register('embedded_video', _.extend({
     return '';
   },
 
+  _getVideoStartTime: function(url) {
+    var query = new URI(url).query();
+    var params = query.split('&');
+    var that = this;
+
+    return _.reduce(params, function(result, param) {
+      var parts = param.split('=');
+
+      if (parts[0] === 't') {
+        return that._timestampToSeconds(parts[1] || '');
+      }
+
+      return result;
+    }, 0);
+  },
+
+  _timestampToSeconds: function(timestamp) {
+    if (timestamp.match(/\d+m(\d+s)?/)) {
+      var parts = timestamp.split('m');
+      return parseInt(parts[0], 10) * 60 + parseInt(parts[1] || 0, 10);
+    }
+    else {
+      return 0;
+    }
+  },
+
   _getRandom: function(string) {
     string = string + new Date().getTime();
     var hash = 0, i, chr, len;

data/app/assets/stylesheets/pageflow/embedded_video.css.scss

@@ -139,11 +139,15 @@
     }
   }
 
-  .iframe_container {
-    .close_button {
-      display: none;
+  .close_button {
+    display: none;
+
+    .has_mobile_platform &.show {
+      display: block;
     }
+  }
 
+  .iframe_container {
     .has_mobile_platform & {
       pointer-events: none;
       height: 0;
@@ -177,10 +181,6 @@
         right: 0;
         bottom: 0;
         opacity: 1;
-
-        .close_button {
-          display: block;
-        }
       }
 
       .iframe_wrapper {

data/app/views/pageflow/embedded_video/page.html.erb

@@ -1,5 +1,10 @@
 <div class="blackLayer"></div>
 <div class="content_and_background embedded_video_page">
+  <div class="close_button" tabindex="4" title="<%= t('pageflow.public.embedded_video.leave_video') %>">
+    <div class="label">
+      <%= t('pageflow.public.close') %>
+    </div>
+  </div>
 
   <div class="backgroundArea">
     <%= background_image_div(configuration, 'background_image') %>
@@ -25,11 +30,6 @@
       </div>
     </div>
     <div class="iframe_container">
-      <div class="close_button" tabindex="4" title="<%= t('pageflow.public.embedded_video.leave_video') %>">
-        <div class="label">
-          <%= t('pageflow.public.close') %>
-        </div>
-      </div>
       <div class="iframe_wrapper"></div>
       <% if configuration['video_caption'].present? %>
         <div class="video_caption"><%= configuration['video_caption'] %></div>

data/lib/pageflow/embedded_video/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module EmbeddedVideo
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/pageflow-embedded-video.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'pageflow', '~> 0.10'
+  spec.add_runtime_dependency 'pageflow', '~> 0.11'
   spec.add_runtime_dependency 'i18n-js'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   # Semantic versioning rake tasks
-  spec.add_development_dependency 'semmy', '~> 0.2'
+  spec.add_development_dependency 'semmy', '~> 0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-embedded-video
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Stefan Schöttelndreyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: 
 email:
 - sschoettelndreyer@codevise.de
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pagetype for embedded youtube/vimeo videos