mediaelement_rails 0.4.0 → 0.5.0

data/app/assets/stylesheets/mediaelement_rails/mediaelementplayer.css.erb

@@ -4,6 +4,7 @@
 	font-family: Helvetica, Arial;
 	text-align: left;
 	vertical-align: top;
+	text-indent: 0;
 }
 
 .me-plugin {
@@ -73,9 +74,12 @@
 	width: 100px;
 	height: 100px;
 	margin: -50px 0 0 -50px;
-	background: url(<%= asset_path "mediaelement_rails/bigplay.png" %>) no-repeat;
+	background: url(<%= asset_path "mediaelement_rails/bigplay.svg" %>) no-repeat;
 }
-.mejs-overlay:hover .mejs-overlay-button{
+.no-svg .mejs-overlay-button { 
+	background-image: url(<%= asset_path "mediaelement_rails/bigplay.png" %>);
+}
+.mejs-overlay:hover .mejs-overlay-button {
 	background-position: 0 -100px ;
 }
 .mejs-overlay-loading {
@@ -96,7 +100,7 @@
 	background: linear-gradient(rgba(50,50,50,0.9), rgba(0,0,0,0.9));
 }
 .mejs-overlay-loading span {
-	display:block;
+	display: block;
 	width: 80px;
 	height: 80px;
 	background: transparent url(<%= asset_path "mediaelement_rails/loading.gif" %>) 50% 50% no-repeat;
@@ -152,7 +156,11 @@
 	height: 16px;
 	width: 16px;
 	border: 0;
-	background: transparent url(<%= asset_path "mediaelement_rails/controls.png" %>) no-repeat;
+	background: transparent url(<%= asset_path "mediaelement_rails/controls.svg" %>) no-repeat;
+}
+
+.no-svg .mejs-controls .mejs-button button { 
+	background-image: url(<%= asset_path "mediaelement_rails/controls.png" %>);
 }
 
 /* :focus for accessibility */
@@ -172,9 +180,9 @@
 	overflow: hidden;
 	text-align: center;
 	padding: auto 4px;
-	box-sizing: content-box;
 	-moz-box-sizing: content-box;
 	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
 }
 .mejs-container .mejs-controls .mejs-time span {
 	font-size: 11px;
@@ -190,10 +198,10 @@
 
 /* Start: Play/pause */
 .mejs-controls .mejs-play button {
-	background-position:0 0;
+	background-position: 0 0;
 }
 .mejs-controls .mejs-pause button {
-	background-position:0 -16px;
+	background-position: 0 -16px;
 }
 /* End: Play/pause */
 
@@ -231,7 +239,7 @@
 	background: linear-gradient(rgba(30,30,30,0.8), rgba(60,60,60,0.8));
 }
 .mejs-controls .mejs-time-rail .mejs-time-buffering {
-	width:100%;
+	width: 100%;
 	background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 	background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
 	background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -313,6 +321,7 @@
 	text-align: center;
 	left: 0;
 }
+
 .mejs-controls .mejs-time-rail .mejs-time-float-corner {
 	position: absolute;
 	display: block;
@@ -326,9 +335,19 @@
 	border-radius: 0;
 	top: 15px;
 	left: 13px;
+}
 
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float {
+	width: 48px;
 }
 
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-current {
+	width: 44px;
+}
+
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-corner {
+	left: 18px;
+}
 
 
 
@@ -341,10 +360,10 @@
 
 /* Start: Fullscreen */
 .mejs-controls .mejs-fullscreen-button button {
-	background-position:-32px 0;
+	background-position: -32px 0;
 }
 .mejs-controls .mejs-unfullscreen button {
-	background-position:-32px -16px;
+	background-position: -32px -16px;
 }
 /* End: Fullscreen */
 
@@ -354,11 +373,11 @@
 }
 
 .mejs-controls .mejs-mute button {
-	background-position:-16px -16px;
+	background-position: -16px -16px;
 }
 
 .mejs-controls .mejs-unmute button {
-	background-position:-16px 0;
+	background-position: -16px 0;
 }
 
 .mejs-controls .mejs-volume-button {
@@ -503,7 +522,7 @@
 }
 
 .mejs-controls .mejs-captions-button button {
-	background-position:-48px 0;
+	background-position: -48px 0;
 }
 .mejs-controls .mejs-captions-button .mejs-captions-selector {
 	visibility: hidden;
@@ -534,20 +553,20 @@
 	list-style-type: none !important;
 	overflow: hidden;
 }
-.mejs-controls .mejs-captions-button .mejs-captions-selector ul li{
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li {
 	margin: 0 0 6px 0;
 	padding: 0;
 	list-style-type: none !important;
-	display:block;
+	display: block;
 	color: #fff;
 	overflow: hidden;
 }
-.mejs-controls .mejs-captions-button .mejs-captions-selector ul li input{
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li input {
 	clear: both;
 	float: left;
 	margin: 3px 3px 0 5px;
 }
-.mejs-controls .mejs-captions-button .mejs-captions-selector ul li label{
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li label {
 	width: 100px;
 	float: left;
 	padding: 4px 0 0 0;
@@ -610,21 +629,21 @@
 	background: linear-gradient(rgba(102,102,102,0.7), rgba(50,50,50,0.6));
 	filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr=#666666,endColorstr=#323232);		
 }
-.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-title{
+.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-title {
 	font-size: 12px;
 	font-weight: bold;
 	display: block;
-	white-space:nowrap;
+	white-space: nowrap;
 	text-overflow: ellipsis;
 	margin: 0 0 3px 0;
 	line-height: 12px;
 }
-.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-timespan{
+.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-timespan {
 	font-size: 12px;
 	line-height: 12px;
 	margin: 3px 0 4px 0;
 	display: block;
-	white-space:nowrap;
+	white-space: nowrap;
 	text-overflow: ellipsis;
 }
 
@@ -688,7 +707,7 @@
 
 
 /* Start: Loop */
-.mejs-controls .mejs-loop-off button{
+.mejs-controls .mejs-loop-off button {
 	background-position: -64px -16px;
 }
 .mejs-controls .mejs-loop-on button {
@@ -697,7 +716,7 @@
 /* End: Loop */
 
 /* Start: backlight */
-.mejs-controls .mejs-backlight-off button{
+.mejs-controls .mejs-backlight-off button {
 	background-position: -80px -16px;
 }
 .mejs-controls .mejs-backlight-on button {
@@ -707,7 +726,7 @@
 
 
 /* Start: picture controls */
-.mejs-controls .mejs-picturecontrols-button{
+.mejs-controls .mejs-picturecontrols-button {
 	background-position: -96px 0;
 }
 /* End: picture controls */
@@ -777,20 +796,20 @@
 	list-style-type: none !important;
 	overflow: hidden;
 }
-.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li{
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li {
 	margin: 0 0 6px 0;
 	padding: 0;
 	list-style-type: none !important;
-	display:block;
+	display: block;
 	color: #fff;
 	overflow: hidden;
 }
-.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li input{
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li input {
 	clear: both;
 	float: left;
 	margin: 3px 3px 0 5px;
 }
-.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li label{
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li label {
 	width: 100px;
 	float: left;
 	padding: 4px 0 0 0;
@@ -799,3 +818,33 @@
 	font-size: 10px;
 }
 /* End: SourceChooser */
+
+
+/* Start: Postroll */
+.mejs-postroll-layer {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: url(<%= asset_path "mediaelement_rails/background.png" %>);
+	background: rgba(50,50,50,0.7);
+	z-index: 1000;
+	overflow: hidden;
+}
+.mejs-postroll-layer-content {
+	width: 100%;
+	height: 100%;
+}
+.mejs-postroll-close {
+	position: absolute;
+	right: 0;
+	top: 0;
+	background: url(<%= asset_path "mediaelement_rails/background.png" %>);
+	background: rgba(50,50,50,0.7);
+	color: #fff;
+	padding: 4px;
+	z-index: 100;
+	cursor: pointer;
+}
+/* End: Postroll */

data/lib/mediaelement_rails/version.rb

@@ -1,3 +1,3 @@
 module MediaelementRails
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/mediaelement_rails.thor

@@ -10,7 +10,7 @@ module MediaelementRails
       "mediaelementplayer.js"  => "javascripts",
       "mediaelementplayer.css" => "stylesheets",
       "mejs-skins.css"         => "stylesheets",
-      "*.{png,gif}"            => "images",
+      "*.{svg,png,gif}"        => "images",
       "*.{swf,xap}"            => "plugins"
     }
     
@@ -77,7 +77,7 @@ module MediaelementRails
     
     # Removes the weird unicode character from the MediaElement source files.
     def remove_weird_characters(content)
-      content.gsub //, ''
+      content.force_encoding('utf-8').gsub //, ''
     end
   end
 end

data/test/integration/assets_test.rb

@@ -1,11 +1,11 @@
 require "test_helper"
 
 class AssetsTest < ActionDispatch::IntegrationTest
+
   test "includes full library" do
     get "/assets/mediaelement-and-player.js"
     assert_response :success
     assert content_type("text/javascript")
-    assert response_includes?("var jQuery = function( selector, context ) {")
     assert response_includes?("var mejs = mejs || {}")
     assert response_includes?("mejs.MediaElementPlayer.prototype = {")
   end
@@ -14,7 +14,6 @@ class AssetsTest < ActionDispatch::IntegrationTest
     get "/assets/mediaelement-without-player.js"
     assert_response :success
     assert content_type("text/javascript")
-    assert !response_includes?("var jQuery = function( selector, context ) {")
     assert response_includes?("var mejs = mejs || {}")
     assert !response_includes?("mejs.MediaElementPlayer.prototype = {")
   end

metadata

@@ -1,105 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: mediaelement_rails
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.4.0
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Tobias Schlottke
 - Pete Browne
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  version_requirements: &2058 !ruby/object:Gem::Requirement
+  requirement: &70273556849820 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
-  requirement: *2058
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *70273556849820
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  version_requirements: &2076 !ruby/object:Gem::Requirement
+  requirement: &70273556849320 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
-  requirement: *2076
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *70273556849320
 - !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &2092 !ruby/object:Gem::Requirement
+  requirement: &70273556848860 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
-  requirement: *2092
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556848860
 - !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &2110 !ruby/object:Gem::Requirement
+  requirement: &70273556848480 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2110
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556848480
 - !ruby/object:Gem::Dependency
   name: turn
-  version_requirements: &2126 !ruby/object:Gem::Requirement
+  requirement: &70273556848020 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2126
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556848020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &2142 !ruby/object:Gem::Requirement
+  requirement: &70273556847600 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2142
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556847600
 - !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &2158 !ruby/object:Gem::Requirement
+  requirement: &70273556878140 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2158
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556878140
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &2174 !ruby/object:Gem::Requirement
+  requirement: &70273556877720 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *2174
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *70273556877720
 description: A MediaElement gem(engine) for Rails. Makes embedding HTML5 video easy.
 email:
 - tobias.schlottke@gmail.com
@@ -115,10 +115,12 @@ files:
 - Rakefile
 - app/assets/images/mediaelement_rails/background.png
 - app/assets/images/mediaelement_rails/bigplay.png
+- app/assets/images/mediaelement_rails/bigplay.svg
 - app/assets/images/mediaelement_rails/controls-ted.png
 - app/assets/images/mediaelement_rails/controls-wmp-bg.png
 - app/assets/images/mediaelement_rails/controls-wmp.png
 - app/assets/images/mediaelement_rails/controls.png
+- app/assets/images/mediaelement_rails/controls.svg
 - app/assets/images/mediaelement_rails/loading.gif
 - app/assets/javascripts/mediaelement_rails/index.js
 - app/assets/javascripts/mediaelement_rails/mediaelement.js
@@ -174,26 +176,26 @@ files:
 - vendor/.gitkeep
 homepage: https://github.com/tobsch/mediaelement_rails
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.15
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.17
+signing_key: 
 specification_version: 3
 summary: MediaElement.js for Rails
 test_files:
@@ -233,4 +235,3 @@ test_files:
 - test/dummy/script/rails
 - test/integration/assets_test.rb
 - test/test_helper.rb
-...