Fixes for inclusion via ssl and sublime compatibilty

moay · Sep 2, 2015 · fdfc385 · fdfc385
1 parent e6d7065
commit fdfc385
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 18 deletions.
diff --git a/dist/afterglow.min.js b/dist/afterglow.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -148,7 +148,8 @@ gulp.task('release', function(){
     		notes: res.notes,
     		manifest: require('./package.json'),
     		owner: 'moay',
-    		repo: 'afterglow'
+    		repo: 'afterglow',
+    		draft: true
     	};
     	if(res.type == "Prerelease")
     	{

diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "afterglow",
   "description": "An easy to integrate HTML5 video player with lightbox support.",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url":"https://github.com/moay/afterglow.git"
+    "url": "https://github.com/moay/afterglow.git"
   },
   "homepage": "http://afterglowplayer.com",
   "devDependencies": {

diff --git a/sandbox/index.html b/sandbox/index.html
@@ -45,6 +45,12 @@ <h2>Local video with poster</h2>
 		<source src="http://afterglowplayer.com/sandbox/video/WEBM/afterglow_local.webm" type="video/webm" />
 	</video>
 
+	<h2>Local video with poster, sublime drop-in</h2>
+	<video id="video2-sublime" class="sublime" class="sublime" width="640" height="360" poster="http://afterglowplayer.com/sandbox/video/Snapshots/afterglow_local.jpg" data-autoresize="fit" preload="none">
+		<source src="http://afterglowplayer.com/sandbox/video/MP4/afterglow_local.mp4" type="video/mp4" />
+		<source src="http://afterglowplayer.com/sandbox/video/WEBM/afterglow_local.webm" type="video/webm" />
+	</video>
+
 	<!-- LOCAL TEST -->
 	<h2>Local video with poster, captions and subtitles</h2>
 	<video id="video2-subtitles" class="afterglow" width="640" height="360" poster="http://afterglowplayer.com/sandbox/video/Snapshots/afterglow_local.jpg" data-autoresize="fit">

diff --git a/src/afterglow.js b/src/afterglow.js
@@ -14,13 +14,13 @@ afterglow = {
 		this.configureVideoJS();
 
 		// Get players including sublime fallback
-		var players = $dom.get("video.afterglow, video.sublime");
+		var players = $dom.get("video.afterglow").concat($dom.get("video.sublime"));
 		for (var i = 0; i < players.length; i++){
 			this.initPlayer(players[i]);
 		}
 
 		// Get players to open in a lightbox including sublime fallback
-		var lightboxplayers = $dom.get("a.afterglow, a.sublime");
+		var lightboxplayers = $dom.get("a.afterglow").concat($dom.get("a.sublime"));
 		for (var i = 0; i < lightboxplayers.length; i++){
 			this.initLightboxPlayer(lightboxplayers[i]);
 		}

diff --git a/src/lightbox/afterglow-lightbox.less b/src/lightbox/afterglow-lightbox.less
@@ -17,13 +17,17 @@
 	}
 
 	.afterglow-lightbox{
-		display:block;
+		display:block !important;
 		position:absolute;
 		top:0;
 		left:0;
 
 		.afterglow-lightboxplayer{
-			display:block;
+			display:block !important;
+
+			video{
+				display:block !important;
+			}
 		}
 
 		div.vjs-fullscreen{

diff --git a/src/videojs/skin/afterglow/vjs-afterglow.less b/src/videojs/skin/afterglow/vjs-afterglow.less
@@ -35,7 +35,7 @@
 // @cog-icon: "\e600";
 
 // Font for texts and times
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300);
 
 // Icon font
 @font-face {
@@ -55,6 +55,7 @@
 		outline:0;
 	}
 
+	overflow:hidden;
 	color: @main-font-color;
 
 	video{