From ced3f8e7111227ff6dbf17629bf604696bece5eb Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 29 Jan 2014 16:03:51 +0100
Subject: [PATCH] Moved css into library.

---
 h5p.classes.php     |  18 ++++++++++++----
 images/h5p_logo.png | Bin 0 -> 16238 bytes
 images/h5p_logo.svg |  26 ++++++++++++++++++++++
 js/h5p.js           |  40 ++++++++++++++++++++--------------
 styles/h5p.css      |  51 +++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 114 insertions(+), 21 deletions(-)
 create mode 100644 images/h5p_logo.png
 create mode 100644 images/h5p_logo.svg

diff --git a/h5p.classes.php b/h5p.classes.php
index 122c14d..b647efb 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -246,6 +246,16 @@ interface H5PFrameworkInterface {
    * Check if export is enabled.
    */
   public function isExportEnabled();
+  
+  /**
+   * Defines getEditorLibraries.
+   *
+   * @param $machineName Library identifier.
+   * @param $majorVersion Library identfier.
+   * @param $minorVersion Library identfier.
+   * @return array Editor libraries?
+   */
+  public function getEditorLibraries($machineName, $majorVersion, $minorVersion, $complete = FALSE);
 }
 
 /**
@@ -1121,7 +1131,7 @@ Class H5PExport {
       // Build h5p.json
       $h5pJson = array (
         'title' => $title,
-        'language' => $exportData['language'] ? $exportData['language'] : 'und',
+        'language' => $language ? $language : 'und',
         'mainLibrary' => $exportData['mainLibrary'],
         'embedTypes' => $embedTypes,
       );
@@ -1145,8 +1155,8 @@ Class H5PExport {
       }
       
       // Add preloaded and dynamic dependencies if they exist
-      if ($preloadedDependencies) { $h5pJson['preloadedDependencies'] = $preloadedDependencies; }
-      if ($dynamicDependencies) { $h5pJson['dynamicDependencies'] = $dynamicDependencies; }
+      if (isset($preloadedDependencies)) { $h5pJson['preloadedDependencies'] = $preloadedDependencies; }
+      if (isset($dynamicDependencies)) { $h5pJson['dynamicDependencies'] = $dynamicDependencies; }
 
       // Save h5p.json
       $results = print_r(json_encode($h5pJson), true);
@@ -1198,7 +1208,7 @@ Class H5PExport {
     $h5pDir = $this->h5pF->getH5pPath() . DIRECTORY_SEPARATOR;
     $zipPath = $h5pDir . 'exports' . DIRECTORY_SEPARATOR . $contentId . '.h5p';
     if (file_exists($zipPath)) {
-      file_delete($zipPath);
+      unlink($zipPath);
     }
   }
 
diff --git a/images/h5p_logo.png b/images/h5p_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fb78641625e3b8d14bc359d65d4d2989b4f3e06
GIT binary patch
literal 16238
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

literal 0
HcmV?d00001

diff --git a/images/h5p_logo.svg b/images/h5p_logo.svg
new file mode 100644
index 0000000..7777c56
--- /dev/null
+++ b/images/h5p_logo.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="36px" height="36px" viewBox="0 0 36 36" enable-background="new 0 0 36 36" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M0.126,13.306h3.07l0.365,3.476h3.354L6.55,13.306h3.083l1.044,9.934H7.594l-0.422-4.018H3.818L4.24,23.24
+		H1.17L0.126,13.306z"/>
+	<path fill="#FFFFFF" d="M27.738,13.306h5.103c1.111,0,1.916,0.264,2.414,0.793c0.498,0.529,0.696,1.281,0.593,2.257
+		c-0.105,1.003-0.489,1.787-1.152,2.351c-0.662,0.565-1.613,0.847-2.85,0.847h-1.681l-0.387,3.686h-3.083L27.738,13.306z
+		 M30.376,17.541h0.752c0.592,0,1.018-0.103,1.279-0.308c0.261-0.205,0.408-0.469,0.442-0.789c0.033-0.312-0.043-0.576-0.228-0.793
+		c-0.185-0.217-0.564-0.325-1.138-0.325h-0.874L30.376,17.541z"/>
+	<g>
+		<polygon fill="#E24E26" points="12.431,25.515 11.035,9.851 26.38,9.851 24.982,25.512 18.698,27.254 		"/>
+		<polygon fill="#F06529" points="18.707,25.923 23.785,24.515 24.98,11.132 18.707,11.132 		"/>
+		<polygon fill="#EAEAEA" points="18.707,16.941 16.165,16.941 15.99,14.974 18.707,14.974 18.707,13.053 18.701,13.053 
+			13.89,13.053 13.936,13.568 14.408,18.862 18.707,18.862 		"/>
+		<polygon fill="#EAEAEA" points="18.707,21.93 18.699,21.933 16.56,21.355 16.423,19.823 15.383,19.823 14.494,19.823 
+			14.763,22.839 18.699,23.932 18.707,23.929 		"/>
+		<polygon fill="#FFFFFF" points="18.701,16.941 18.701,18.862 21.066,18.862 20.843,21.354 18.701,21.932 18.701,23.931 
+			22.639,22.839 22.668,22.514 23.119,17.457 23.166,16.941 22.649,16.941 		"/>
+		<polygon fill="#FFFFFF" points="18.701,13.053 18.701,14.246 18.701,14.969 18.701,14.974 23.335,14.974 23.335,14.974 
+			23.341,14.974 23.38,14.542 23.467,13.568 23.513,13.053 		"/>
+	</g>
+</g>
+</svg>
diff --git a/js/h5p.js b/js/h5p.js
index 17ede95..5edcafa 100644
--- a/js/h5p.js
+++ b/js/h5p.js
@@ -33,7 +33,7 @@ H5P.init = function () {
     else if (document.documentElement.mozRequestFullScreen) {
       H5P.fullScreenBrowserPrefix = 'moz';
     }
-    else if (document.documentElement.msRequestFullScreen) {
+    else if (document.documentElement.msRequestFullscreen) {
       H5P.fullScreenBrowserPrefix = 'ms';
     }
   }
@@ -65,24 +65,30 @@ H5P.init = function () {
       var $iframe = H5P.jQuery(iframe),
         contentId = $iframe.data('content-id'),
         mainLibrary = $iframe.data('class');
+        
+      $iframe.ready(function () {      
+        // This is a bit hacky but necessary until libraries runs callbacks or similar when "done" or resizing or something.
+        resizeIframeInterval = setInterval(function () {
+          var $doc = $iframe.contents(); 
+          var contentHeight = $doc.height();
+          var frameHeight = $iframe.innerHeight();
+          
+          if (frameHeight !== contentHeight) {
+            H5P.resizeIframe(contentId, contentHeight);
+            $doc[0].documentElement.style.margin = '0 0 1px 0';
+          }
+          else {
+            // Small trick to make scrollbars go away in ie.
+            $doc[0].documentElement.style.margin = '0 0 0 0';
+          }
+          
+        }, 300);
+      });
 
       iframe.contentDocument.open();
       iframe.contentDocument.write('<!doctype html><html><head>' + H5PIntegration.getHeadTags(contentId) + '</head><body><div class="h5p-content" data-class="' + mainLibrary + '" data-content-id="' + contentId + '"/></body></html>');
       iframe.contentDocument.close();
     });
-
-    // TODO: This seems very hacky... why can't we just use the resize event? What happens if we ain't done before the next interval starts?
-    setInterval(function () {
-      $h5pIframes.each(function (idx, iframe) {
-        var $iframe = H5P.jQuery(iframe);
-        var contentHeight = $iframe.contents().height();
-        var frameHeight = $iframe.innerHeight();
-
-        if (frameHeight !== contentHeight) {
-          H5P.resizeIframe($iframe.data('content-id'), contentHeight);
-        }
-      });
-    }, 250);
   }
 };
 
@@ -175,7 +181,7 @@ H5P.fullScreen = function ($el, obj, exitCallback, $body) {
     $body.keyup(keyup);
   }
   else {
-    var first, eventName = H5P.fullScreenBrowserPrefix + 'fullscreenchange';
+    var first, eventName = (H5P.fullScreenBrowserPrefix === 'ms' ? 'MSFullscreenChange' : H5P.fullScreenBrowserPrefix + 'fullscreenchange');
     H5P.isFullscreen = true;
     document.addEventListener(eventName, function () {
       if (first === undefined) {
@@ -203,7 +209,9 @@ H5P.fullScreen = function ($el, obj, exitCallback, $body) {
       $el[0].requestFullScreen();
     }
     else {
-      $el[0][H5P.fullScreenBrowserPrefix + 'RequestFullScreen'](H5P.fullScreenBrowserPrefix === 'webkit' ? Element.ALLOW_KEYBOARD_INPUT : undefined);
+      var method = (H5P.fullScreenBrowserPrefix === 'ms' ? 'msRequestFullscreen' : H5P.fullScreenBrowserPrefix + 'RequestFullScreen');
+      var params = (H5P.fullScreenBrowserPrefix === 'webkit' ? Element.ALLOW_KEYBOARD_INPUT : undefined);
+      $el[0][method](params);
     }
 
     $el.add(H5P.$body).addClass('h5p-fullscreen');
diff --git a/styles/h5p.css b/styles/h5p.css
index b9874d6..ca637e6 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -27,6 +27,8 @@ div.h5p-semi-fullscreen {
   top: 0;
   left: 0;
   z-index: 101;
+  width: 100%;
+  height: 100%;
 }
 
 .h5p-content-controls {
@@ -84,7 +86,7 @@ div.h5p-semi-fullscreen {
   background: -ms-linear-gradient(top,  rgba(4,104,206,1) 0%,rgba(100,152,254,1) 100%); /* IE10+ */
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0468ce', endColorstr='#6498fe',GradientType=0 ); /* IE6-9 */
 }
-.h5p-iframe-wrapper.h5p-fullscreen {
+div.h5p-fullscreen {
   width: 100%;
   height: 100%;
 }
@@ -167,3 +169,50 @@ body.h5p-iframe-content div.h5p-content {
 body.h5p-iframe-content.h5p-fullscreen div.h5p-content {
   height: 100%;
 }
+
+.h5p-export {
+  margin-top: 6px;
+  display: block;
+  position: relative;
+  float: left;
+  border-radius: 4px;
+  padding: 4px 58px 3px 12px;
+  font-weight: 900; 
+  font-family: "Arial Black", Arial, sans-serif;
+  text-transform: uppercase;
+  color: white !important;
+  background-color: #ccc;
+  box-shadow: 0px 0px 4px #666;
+}
+
+.h5p-export:after {
+  content: "";
+  
+  display: inline;
+  width: 45px;
+  height: 27px;
+  
+  position: absolute;
+  right: 0;
+  top: 0;
+  
+  background-image: url(../images/h5p_logo.png);
+  background-image: url(../images/h5p_logo.svg), none;
+  background-repeat: no-repeat;
+  background-position: left center;
+}
+
+.h5p-export:hover {
+  text-decoration: none;
+  color: white;
+  box-shadow: 0px 0px 6px #333;
+  background-color: #0092bf;
+  /* Firefox */
+  -moz-transition: all 0.4s ease-in;
+  /* WebKit */
+  -webkit-transition: all 0.4s ease-in;
+  /* Opera */
+  -o-transition: all 0.4s ease-in;
+  /* Standard */
+  transition: all 0.4s ease-in;
+}