Merge branch 'develop' into feature/touchSwipe

Conflicts:
	lib/Readium.js

Author: danielweck

grunt/cssmin.js

@@ -18,17 +18,17 @@ module.exports = function(grunt) {
     return {
         chromeApp: {
             files: {
-                'build/chrome-app/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css', 'css/library.css']
+                'build/chrome-app/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/bootstrap-accessibility.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css', 'css/library.css']
             }
         },
         cloudReader: {
             files: {
-                'build/cloud-reader/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css', 'css/library.css']
+                'build/cloud-reader/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/bootstrap-accessibility.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css', 'css/library.css']
             }
         },
         cloudReaderLite: {
             files: {
-                'build/cloud-reader-lite/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css']
+                'build/cloud-reader-lite/css/readium-all.css': ['css/sourcesanspro.css', 'css/bootstrap.css', 'css/bootstrap-accessibility.css', 'css/readium_js.css', 'css/viewer.css', 'css/viewer_audio.css', 'css/settings.css']
             }
         }
     };

lib/EpubLibrary.js

@@ -61,7 +61,7 @@ Versioning){
             } else {                                      
             	cssRule = styleSheet.rules[ii];            
             }                                             
-            if (cssRule)  {                               
+            if (cssRule && cssRule.selectorText)  {                               
             	if (cssRule.selectorText.toLowerCase()=='.library-item') {          
                     heightRule = cssRule;                    
                 } 
@@ -79,6 +79,7 @@ Versioning){
 
 
 	var setItemHeight = function(){
+        if (!heightRule || !noCoverRule) return;
 
 		var medWidth = 2,
 			smWidth = 3,

lib/EpubReader.js

@@ -798,9 +798,9 @@ Readium){
                 $(document.body).removeClass('hide-ui');
                 setTimeout(function(){ $("#aboutButt1").focus(); }, 50);
             });
-    		$('#about-dialog').on('shown.bs.modal', function(){
+            $('#about-dialog').on('shown.bs.modal', function(){
                 Keyboard.scope('about');
-    		});
+            });
 
             var readerSettings;
             if (settings.reader){
@@ -910,7 +910,7 @@ Readium){
     };
 
     return {
-		loadUI : applyKeyboardSettingsAndLoadUi,
+        loadUI : applyKeyboardSettingsAndLoadUi,
         unloadUI : unloadReaderUI
     };
 

lib/Readium.js

@@ -367,7 +367,7 @@ define('text',['module'], function (module) {
 });
 
 
-define('text!version.json',[],function () { return '{"readiumJs":{"sha":"0dc45978a2850e32bb2b3d5ff894d9ce1e306814","tag":"Release-0.10-395-g0dc4597","clean":true},"readiumSharedJs":{"sha":"1375f2de8ab214e352fb8ac863a71db150da84da","tag":"Release-0.10-474-g1375f2d","clean":true}}';});
+define('text!version.json',[],function () { return '{"readiumJs":{"sha":"4242280394c045dd5d460a36041022b985c897b0","tag":"Release-0.10-397-g4242280","clean":true},"readiumSharedJs":{"sha":"94a0dc7d5bae04540b715ce17a68f419394f5e03","tag":"Release-0.10-477-g94a0dc7","clean":true}}';});
 
 /*
 This code is required to IE for console shim
@@ -20525,13 +20525,20 @@ ReadiumSDK.Views.ReflowableView = function(options, reader){
         _$epubHtml = $("html", epubContentDocument);
         _$htmlBody = $("body", _$epubHtml);
 
-        // Video surface sometimes (depends on the video codec) disappears from CSS column (i.e. reflow page) during playback (audio continues to play normally, but video canvas is invisible).
-        // Enabling CSS3D fixes this Chrome-specific rendering bug.
+        // TODO: how to address this correctly across all the affected platforms?!
+        // Video surface sometimes (depends on the video codec) disappears from CSS column (i.e. reflow page) during playback
+        // (audio continues to play normally, but video canvas is invisible).
+        // https://github.com/readium/readium-js-viewer/issues/265#issuecomment-73018762
+        // ...Meanwhile, reverting https://github.com/readium/readium-js-viewer/issues/239
+        // by commenting the code below (which unfortunately only works with some GPU / codec configurations,
+        // but actually fails on several other machines!!)
+        /*
         if(window.chrome
             && window.navigator.vendor === "Google Inc.") // TODO: Opera (WebKit) sometimes suffers from this rendering bug too (depends on the video codec), but unfortunately GPU-accelerated rendering makes the video controls unresponsive!!
         {
             $("video", _$htmlBody).css("transform", "translateZ(0)");
         }
+        */
 
         _htmlBodyIsVerticalWritingMode = false;
         _htmlBodyIsLTRDirection = true;
@@ -29756,7 +29763,17 @@ define('epub-fetch/iframe_zip_loader',['URIjs'], function(URI){
                 // TODO: Currently using the document.write() approach only for IE, as it breaks CSS selectors
                 // with namespaces for some reason (e.g. the childrens-media-query sample EPUB)
                 iframe.contentWindow.document.open();
-                iframe.contentWindow.document.write(contentDocumentData);
+                
+                // Currently not handled automatically by winstore-jscompat,
+                // so we're doing it manually. See:
+                // https://github.com/MSOpenTech/winstore-jscompat/
+                if (window.MSApp && window.MSApp.execUnsafeLocalFunction) {
+                    window.MSApp.execUnsafeLocalFunction(function() {
+                        iframe.contentWindow.document.write(contentDocumentData);
+                    });
+                } else {
+                    iframe.contentWindow.document.write(contentDocumentData);
+                }
             }
 
             iframe.onload = function () {