From cee88a544f84f29afda324e85d246cfc8080de69 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Fri, 23 Sep 2016 15:46:52 +0200 Subject: [PATCH 01/41] Made it possible to ignore build files when exporting development folders. --- h5p-default-storage.class.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php index a1cd27f..88a4776 100644 --- a/h5p-default-storage.class.php +++ b/h5p-default-storage.class.php @@ -275,6 +275,8 @@ class H5PDefaultStorage implements \H5PFileStorage { throw new \Exception('unabletocopy'); } + $ignoredFiles = self::getIgnoredFiles("{$source}/.h5pignore"); + $dir = opendir($source); if ($dir === FALSE) { trigger_error('Unable to open directory ' . $source, E_USER_WARNING); @@ -282,7 +284,7 @@ class H5PDefaultStorage implements \H5PFileStorage { } while (false !== ($file = readdir($dir))) { - if (($file != '.') && ($file != '..') && $file != '.git' && $file != '.gitignore') { + if (($file != '.') && ($file != '..') && $file != '.git' && $file != '.gitignore' && !in_array($file, $ignoredFiles)) { if (is_dir("{$source}/{$file}")) { self::copyFileTree("{$source}/{$file}", "{$destination}/{$file}"); } @@ -294,6 +296,25 @@ class H5PDefaultStorage implements \H5PFileStorage { closedir($dir); } + /** + * Retrieve array of file names from file. + * + * @param string $file + * @return array Array with files that should be ignored + */ + private static function getIgnoredFiles($file) { + if (file_exists($file) === FALSE) { + return array(); + } + + $contents = file_get_contents($file); + if ($contents === FALSE) { + return array(); + } + + return preg_split('/\s+/', $contents); + } + /** * Recursive function that makes sure the specified directory exists and * is writable. From a2097d56cbfd62b1cc5548bce01201a9d192cfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Ellingsen?= Date: Tue, 13 Sep 2016 09:52:38 +0200 Subject: [PATCH 02/41] HVP-73: Update font with new icons --- fonts/h5p-core-14.eot | Bin 5008 -> 5180 bytes fonts/h5p-core-14.svg | 6 +++++- fonts/h5p-core-14.ttf | Bin 4828 -> 5000 bytes fonts/h5p-core-14.woff | Bin 4904 -> 5076 bytes 4 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 fonts/h5p-core-14.eot mode change 100644 => 100755 fonts/h5p-core-14.svg mode change 100644 => 100755 fonts/h5p-core-14.ttf mode change 100644 => 100755 fonts/h5p-core-14.woff diff --git a/fonts/h5p-core-14.eot b/fonts/h5p-core-14.eot old mode 100644 new mode 100755 index 9a9081651f51c47bb33af7a875d8b58df4090020..ba3ee9efc57b45a14ab0fa8cb5a3f795009308c4 GIT binary patch delta 573 zcmXw$O=uHA7>3_(_9rR*%Tn#uG)kn^6|6-NT9FOtt)R!|Cb~;annPn3x`l|Awpz4} zr6ygGg7|Y3K@f_bdeR`olLzrEN=mYL3V2b>`t6D^!#B_SzBBVNQ!(~VsOAA+eW0pN z$QwJBTs?np`3-Y zTK~-vW=s@Vh{qLT{>nUBD7vL9?}s!%lbJ8i&Cl4$vxm2tE#}ijyX0VWocdU(u#moP z7jsWu^`2sW&6m7&<`-N@>|me}`jF(Z=hDrKAq{e45>yb-UTtWOz=sO2E{N0-*=RJG1l?L zaL4D9h?YUy%noBtc}M09_O_Vus+R%v#M9*&wRCp9g0$VTSZB zn$$(j3=rBP!wZ5iYu;V)IQ31Egd4?-m`(H-}cSf5!Ifiq%1Pd?u@7r{o@}fsnh?E&5@o{nf9Lj;tn8x1_J|MO-5>B3TLfjIZ%lRP~I#9D8RwN@)yYW0rFKc za!V@w4hydW@nAOzB&z`)G1W^xH*wQ~eW20`)OYc4QKs9LnS}S(bT*%y(vHrcMS{ zpq=XM;*9Ey$4Wy^GTMePE-Vc_wfQ3RWL_Ej=i4sF^V@u7;0C%32rl!~b-?J!4T9zZ z!Vqz=B+yk1ldlVUC}%KKF>GLX!l=S{iph`p4vP`XHC8>=DXiz%tk~^ + + + + - + diff --git a/fonts/h5p-core-14.ttf b/fonts/h5p-core-14.ttf old mode 100644 new mode 100755 index 77aa1c73fcd62368df09dd9e00219130e384c663..c501fcbaeab2bc898cafafe950860785492ac8d8 GIT binary patch delta 577 zcmXw$PiPZC6vn?d`zI-Bn@z<|O`}9?&B2PrgDtW-2p&8LJ=oktv(%(HG8wmw<|6)y!n0an|W_`zK*Y_Dj)z6 zRH0yU=E8}S(INc>E3bHF=Zcp7vAcEzpak>UytQO=G?*WA49_oI%kOM<>da4oC<;02 zN@TV9n=Q;ZRbU|;*0_T4jd`q4ER`?48;JoimHFbr;@lZ4K7DY9g)9q`MXPLMj0Tyv znUhzoV(#Iyf#b~2xyVaCXqY171(Emj zU{BijknE!=DH^5+KP}R{APBSJe4+=5?}{Qyfh`r1l%n^`vrS6R((UC;b9X~H0|_;I zf8%o0{E3MFV}Z|uZ$JEx&a^R=l>hV~={F2!R|T!`rZx<;4&0z%V^PXGV_ delta 424 zcmeBBzoS~uz{tSBz|GLWz|3IaAFOZ0FT{2oD6$8L6OwZi3tp?tJHo)gC$g;xRjAai_j@{=7C#V<&60R=!7YUCzX6fh_-@&WlzfP96##N5=mYk74U7z9~> zmTW7?FD?N(6bOVs>J=E6S=LNEQ0*K65&^o4nSlxDABAU(FS=gzyqNNm@&Did|3S)u zVhk@jfMR_w8NgzU{~t@Sh}VhNir0t>0`)OYE)*7?ypYjlawgLZneWWZOq~p@Kr7YR z#TnHZkCld;WV8)oTv!@ifF>GLX!l=S{iph`p4vP`XHC8>=DXiz%tk~^}X~!;(kBx!A zU$lv^A6Gz*8I7$cql?d`irErC1s19j?{=#Drn7UB`@(hTFO2D#OL^wL0uiPn*jVkX z7joJ2fWaINON5sjKMG6&W|He+iBL$RLa|(7?iAN&B+kC-H)m$2*mu%=%)~*7_>nyu z#cYKKn;*DN_!y?X3)y0hxt~1zxy1b^y$4FOb7kJ=>3^TXnWEMloi2~dRbnupAi#Sk zTKU$^ZEDxrtL@tz@_u<9>)gMUYprdgy~6xj2R={U=lFwoB_6V_TFcgwwTpYmm$ICX zbZn8}lBUGO00ht8ORh+ET`|ygxf{^}YT}x>Bene|mlUW8z5CtQK)V%)3^bsJf_Bgr ze6du$o)Q_)k9?kg_N1kUtR5P*L_Os}$|B7PL8R)=khnMaNl`@Ex7k69YksdX^1|TSRY403&dGUe96yxA wQJlae9^nOcXoT`Y7q`?QwXF4PCGCB{2wVv+u^+HVhwe8M{8-V=)8-ca2C@f`&Hw-a delta 468 zcmcbjzCul`+~3WOfsp|Sgf$qrLA1~v2FA$;g@q?-iq&6F&P^;}U|`GuikE=!Yn6FN z(i4k8Vt0Ui4k#8#oUialXq;Hv@Q_v{yUWTYmhFfa%t0M(d*FlVh}c?M7rC^iGg zR{>!T4wkTRsby)Gyw7yz*vEi zFE24S6(|+}w0s)~&t1!_TaaH2bgVE)FGL+Pkj2chW-fnVvPSEORSSOA+O5tm&Zy3KtTf~#qiqP|!qU)Fn=_dw^UByi-*!2k-{va=Hw)PO z%RF@*AO?t@EFowvAPf-)O9EZRFgah)LpOt=ieUr86Gj!rQ%ru$cUX*AuCeN|PGLRA bX2os?bUDz2j64iHU` Date: Fri, 28 Oct 2016 10:46:05 +0200 Subject: [PATCH 03/41] Don't store results if they have no score. HFP-173 --- js/h5p.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 60cfdd4..65ec2e1 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1637,7 +1637,7 @@ H5P.shuffleArray = function (array) { * Reported time consumption/usage */ H5P.setFinished = function (contentId, score, maxScore, time) { - if (H5PIntegration.postUserStatistics === true) { + if (score && H5PIntegration.postUserStatistics === true) { /** * Return unix timestamp for the given JS Date. * From bae31451c0a1f49835ca4a1351f90e86581e9f06 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Fri, 28 Oct 2016 13:45:11 +0200 Subject: [PATCH 04/41] Check that score is a number before storing it to the database. HFP-173 --- js/h5p.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 65ec2e1..e6b4555 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1637,7 +1637,7 @@ H5P.shuffleArray = function (array) { * Reported time consumption/usage */ H5P.setFinished = function (contentId, score, maxScore, time) { - if (score && H5PIntegration.postUserStatistics === true) { + if (typeof score === 'number' && H5PIntegration.postUserStatistics === true) { /** * Return unix timestamp for the given JS Date. * From 7e90871cb733419ecc8f8af606297ad8df88a257 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 11 Nov 2016 11:51:20 +0100 Subject: [PATCH 05/41] Fixing typo --- js/h5p.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index e6b4555..69829c2 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -85,14 +85,14 @@ H5P.init = function (target) { } // Determine if we can use full screen - if (H5P.canHasFullScreen === undefined) { + if (H5P.fullscreenEnabled === undefined) { /** * Use this variable to check if fullscreen is supported. Fullscreen can be * restricted when embedding since not all browsers support the native * fullscreen, and the semi-fullscreen solution doesn't work when embedded. * @type {boolean} */ - H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + H5P.fullscreenEnabled = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; // We should consider document.msFullscreenEnabled when they get their // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe } @@ -141,7 +141,7 @@ H5P.init = function (target) { var instance = H5P.newRunnable(library, contentId, $container, true, {standalone: true}); // Check if we should add and display a fullscreen button for this H5P. - if (contentData.fullScreen == 1 && H5P.canHasFullScreen) { + if (contentData.fullScreen == 1 && H5P.fullscreenEnabled) { H5P.jQuery('
').prependTo($container).children().click(function () { H5P.fullScreen($container, instance); }); From 6001b68b99a019a2dc59469b9becf2542d0c4d4e Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 11 Nov 2016 11:57:54 +0100 Subject: [PATCH 06/41] Making naming harder to misunderstand --- js/h5p.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index 69829c2..c6767b5 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -85,14 +85,14 @@ H5P.init = function (target) { } // Determine if we can use full screen - if (H5P.fullscreenEnabled === undefined) { + if (H5P.fullscreenSupported === undefined) { /** * Use this variable to check if fullscreen is supported. Fullscreen can be * restricted when embedding since not all browsers support the native * fullscreen, and the semi-fullscreen solution doesn't work when embedded. * @type {boolean} */ - H5P.fullscreenEnabled = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + H5P.fullscreenSupported = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; // We should consider document.msFullscreenEnabled when they get their // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe } @@ -141,7 +141,7 @@ H5P.init = function (target) { var instance = H5P.newRunnable(library, contentId, $container, true, {standalone: true}); // Check if we should add and display a fullscreen button for this H5P. - if (contentData.fullScreen == 1 && H5P.fullscreenEnabled) { + if (contentData.fullScreen == 1 && H5P.fullscreenSupported) { H5P.jQuery('
').prependTo($container).children().click(function () { H5P.fullScreen($container, instance); }); From ec2ff180c13e5cb6948087f1b439d7c23e06846a Mon Sep 17 00:00:00 2001 From: thomasmars Date: Thu, 17 Nov 2016 11:13:59 +0100 Subject: [PATCH 07/41] Updated H5P font HFP-114 --- fonts/h5p-core-14.svg | 29 ------------ fonts/{h5p-core-14.eot => h5p-core-15.eot} | Bin 5180 -> 5168 bytes fonts/h5p-core-15.svg | 46 +++++++++++++++++++ fonts/{h5p-core-14.ttf => h5p-core-15.ttf} | Bin 5000 -> 5020 bytes fonts/{h5p-core-14.woff => h5p-core-15.woff} | Bin 5076 -> 5096 bytes styles/h5p.css | 10 ++-- 6 files changed, 51 insertions(+), 34 deletions(-) delete mode 100755 fonts/h5p-core-14.svg rename fonts/{h5p-core-14.eot => h5p-core-15.eot} (64%) mode change 100755 => 100644 create mode 100644 fonts/h5p-core-15.svg rename fonts/{h5p-core-14.ttf => h5p-core-15.ttf} (77%) mode change 100755 => 100644 rename fonts/{h5p-core-14.woff => h5p-core-15.woff} (75%) mode change 100755 => 100644 diff --git a/fonts/h5p-core-14.svg b/fonts/h5p-core-14.svg deleted file mode 100755 index f06a083..0000000 --- a/fonts/h5p-core-14.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/fonts/h5p-core-14.eot b/fonts/h5p-core-15.eot old mode 100755 new mode 100644 similarity index 64% rename from fonts/h5p-core-14.eot rename to fonts/h5p-core-15.eot index ba3ee9efc57b45a14ab0fa8cb5a3f795009308c4..5a51b7221e45d6e34ce98293705d05ca207b6a73 GIT binary patch delta 664 zcmZva&ui0Q7{|YFer;>YO1gAZU0_-3SR8iiZ0kYAn+FjOQ?`rXvMw}(b`4zzoeDvm zAhJu$O$5P{w+V_2*+#*uhcP_(2YB`%>^gm3`>q!kNb>nS-}im*t59JZZawU#1@(KF)7_og@3vV9#kKut{+3^T_c0<_bxX%_1@IZEx8-NFlJab-ZdU5d{u0wXA=XTiTEMe_;%U} z`DEMx2?Ka3Sf+_Pf@vIZO zLB%MRMW9izB{+c+a(+4J{TuPOk-PeW*IHj~u8kK9#VE{_i~Y0@^ImPE?zS)w4>fF{ R4i~L{N@L2gZC>D0{{@vCb!h+q delta 646 zcmaixyGz4R6o-G;B(+*>ZR?}>!q-sIXbSZ)2!eu>I*B5PHpD;_+l1P|O#}yDpz%8B zpp%1(Ac!L3q?1k#{R3PD2N9fHJi+VaD{#s8o!>p2%e|-Z>$uWe2CTYDx4O2MlJV`U zfQ3#tP+`DE7A8>wNq3^PTBFUs#aprPImOqsQbt;L9$r_P+{>D!oy{i~V8=iRmZ{GK zmhawyQgU=zRPg&1M*c|NY^8IHQ@61&5cUo>Id2d5T<1>x&MWS&)32ygs9+ z&4ZH?mHd=uTsZbZ4iY7ZT3!xGX6t;E^)beG**Ifo&ulal2Mv@{du!97-Zun3uOJ`1 zx%V2s{_>zS$MfM1R>|eaB%g_BKCcax{4mn86d>{pC_o`r1WO2@U$9KPFIXXN5bPs1 z1Q(+US9D$`7g42xl20x`5F3Iest*g6iH|%Uq6USeO$0vTjNoD)v&Xsnn?cq mnqy{mVb;#nC)zdFE+5eTZTNQse~HHG{vOKh=m-y%HGTlAqH%Em diff --git a/fonts/h5p-core-15.svg b/fonts/h5p-core-15.svg new file mode 100644 index 0000000..3a440df --- /dev/null +++ b/fonts/h5p-core-15.svg @@ -0,0 +1,46 @@ + + + + + + +{ + "fontFamily": "h5p", + "description": "Font generated by IcoMoon.", + "majorVersion": 1, + "minorVersion": 1, + "version": "Version 1.1", + "fontId": "h5p", + "psName": "h5p", + "subFamily": "Regular", + "fullName": "h5p" +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/h5p-core-14.ttf b/fonts/h5p-core-15.ttf old mode 100755 new mode 100644 similarity index 77% rename from fonts/h5p-core-14.ttf rename to fonts/h5p-core-15.ttf index c501fcbaeab2bc898cafafe950860785492ac8d8..d3a9a27a77cabd64a96df07d6f000077fd64c3c1 GIT binary patch delta 687 zcmZuu&ui0A9RIu|O}n+UOViCN3oPq?5XEk-Z7(X~#giy(+IbLc*2QFyHnH8HQ=t

z3&m7g{zS@mTD5w^^!NYvW&k!xyl0zjpXM0xcQj+RyY=wf3ww+B2O#A-mbsRQe?0<} z4EYs@gjg&h5Wh)$#%XMHR)1v`;(VW)>(#HD`X6nNgnbf<4YT88mL-9-M0~1gHmsfB z396XpC91yH-k_rNsZY5NQF^}Hzs7_;w!(zZ_t>3O_g`Ov*hh}?89Apb8TkU6o+~T* z^xRces$9~QQspu$PK+x${UjLL@xl4Y9nCmC&N8e*CBUWi9gLe44sa8QOHWYt@Dt5&PM?lq?h`2wo2&_WyQ@X(~E kDj<)-Fg^rJmc8kkEi6&o#wJ{tXboLDw@7z#CfHV^CqKw_HUIzs delta 625 zcmaKpF-RL>6vzLccZo5<#7jWMR#B=%!RSSzI0#k;H|?NkhhTHW(^E|DNE~#ELIztq z)ZAjBf`fxgK`3<)htf_uIk>sFx(c1T`2X5(=#+!w{r>;=zVE$z_a(WXtUv&WU>6$9 zH}k_Iv3T%1oh!b%e8KW=pQ^6_@shf_W|ck07U~nm(AwtCYVG6WA@vy$gJWAOk-h6b zETP7jLn9OlutUoOb+1#{+Ft(EZUBZ(o!xZvQ&z`#XN^XVhFP$-J@kqw^(X4?qE)bu zzc#0+&)MX{bIV&CluyEud1(5F!yl7E)Wnhy-`{L1f2cz(i zVpkU>*rYTvi*~8J?iRb#Lnan!mQcnz3yR!W8bdJa-q0tns9PZm{A{AVtNs}NeSA*t MU-S18FXUf)25V+(CIA2c diff --git a/fonts/h5p-core-14.woff b/fonts/h5p-core-15.woff old mode 100755 new mode 100644 similarity index 75% rename from fonts/h5p-core-14.woff rename to fonts/h5p-core-15.woff index dceb7fe165002520cf66aad710d88714e6295cd7..fa8d5b067ca91876764dca20068333248065fb86 GIT binary patch delta 715 zcmZvZ!D|yi6vn^V-K1%aJh$HUPdxH3ca>@$tkblf35?&q&2$5yh`>x5@iV@tV~7caztGGSw}QPm!@GW&gIG z)x9N5 zc+0P(Mm`Y9L77a4PAj0uA&E1tcVv4qM;=D-G-MSj+96YycolMl2E7_`l>A2_$8iCp z6fWQR6HFp2dr5v4>oX6d}QgJ90Is^y*QA8bzdZg!_lH|fArR@}j z4%&8U-%Hn_Y?tl+>qg7%03zVQy3)rV>!*CTtGw@wQ(AeyxptS{PasDthn=l& z+kxjU0eN~jr<8v9{&zqVu*!_5lv1gr2wJ^WdRG}QD&2Z_%xZ=W=3Ta)(Wod*oZp)+hht1z8J$-(}>4e=L-}CBUoXvh?&I6J*FVDZa@h zlfj-oNRrE%N62l>$h5$3@z+u-A5j;{Awd-Egy%)Ai)iV|Oz@F$= rhE@zsSn&MirW;{_J$x*q2^Z1Os(RS&m3-;g7u4S|IO(GNVvqg>(D8b( diff --git a/styles/h5p.css b/styles/h5p.css index b0e7ee2..e5c5240 100644 --- a/styles/h5p.css +++ b/styles/h5p.css @@ -3,11 +3,11 @@ /* Custom H5P font to use for icons. */ @font-face { font-family: 'h5p'; - src: url('../fonts/h5p-core-14.eot?inh2er'); - src: url('../fonts/h5p-core-14.eot?inh2er#iefix') format('embedded-opentype'), - url('../fonts/h5p-core-14.ttf?inh2er') format('truetype'), - url('../fonts/h5p-core-14.woff?inh2er') format('woff'), - url('../fonts/h5p-core-14.svg?inh2er#h5p-core-14') format('svg'); + src: url('../fonts/h5p-core-15.eot?1a4hhb'); + src: url('../fonts/h5p-core-15.eot?1a4hhb#iefix') format('embedded-opentype'), + url('../fonts/h5p-core-15.ttf?1a4hhb') format('truetype'), + url('../fonts/h5p-core-15.woff?1a4hhb') format('woff'), + url('../fonts/h5p-core-15.svg?1a4hhb#h5p-core-15') format('svg'); font-weight: normal; font-style: normal; } From d55134151c638f3498634a27d7cf36753430525f Mon Sep 17 00:00:00 2001 From: thomasmars Date: Thu, 17 Nov 2016 12:56:15 +0100 Subject: [PATCH 08/41] Moved registering of external dispatcher listener. - This will dispatch events that are dispatched inside the constructor of content types HFP-86 --- js/h5p.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index c6767b5..32ca652 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1984,6 +1984,21 @@ H5P.createTitle = function (rawTitle, maxLength) { // Init H5P when page is fully loadded $(document).ready(function () { + + /** + * Indicates if H5P is embedded on an external page using iframe. + * @member {boolean} H5P.externalEmbed + */ + + // Relay events to top window. This must be done before H5P.init + // since events may be fired on initialization. + if (H5P.isFramed && H5P.externalEmbed === false) { + H5P.externalDispatcher.on('*', function (event) { + console.log("external dispatcher got event, relaying it", event); + window.parent.H5P.externalDispatcher.trigger.call(this, event); + }); + } + /** * Prevent H5P Core from initializing. Must be overriden before document ready. * @member {boolean} H5P.preventInit @@ -2025,18 +2040,6 @@ H5P.createTitle = function (rawTitle, maxLength) { // pagehide is used on iPad when tabs are switched H5P.$window.on('pagehide', storeCurrentState); } - - /** - * Indicates if H5P is embedded on an external page using iframe. - * @member {boolean} H5P.externalEmbed - */ - - // Relay events to top window. - if (H5P.isFramed && H5P.externalEmbed === false) { - H5P.externalDispatcher.on('*', function (event) { - window.parent.H5P.externalDispatcher.trigger.call(this, event); - }); - } }); })(H5P.jQuery); From f82f3a354c8ecf41f5089acc35c87253a123f8ac Mon Sep 17 00:00:00 2001 From: thomasmars Date: Thu, 17 Nov 2016 13:27:41 +0100 Subject: [PATCH 09/41] Removed debug HFP-86 --- js/h5p.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 32ca652..77f9f0e 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1994,7 +1994,6 @@ H5P.createTitle = function (rawTitle, maxLength) { // since events may be fired on initialization. if (H5P.isFramed && H5P.externalEmbed === false) { H5P.externalDispatcher.on('*', function (event) { - console.log("external dispatcher got event, relaying it", event); window.parent.H5P.externalDispatcher.trigger.call(this, event); }); } From 9b0d77a7212b9c6d37b0687dbde6bd2915c9002a Mon Sep 17 00:00:00 2001 From: thomasmars Date: Sat, 19 Nov 2016 12:29:38 +0100 Subject: [PATCH 10/41] Check instanceof score as well to validate number. HFP-215 --- js/h5p.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 77f9f0e..ebc7870 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1637,7 +1637,8 @@ H5P.shuffleArray = function (array) { * Reported time consumption/usage */ H5P.setFinished = function (contentId, score, maxScore, time) { - if (typeof score === 'number' && H5PIntegration.postUserStatistics === true) { + var validScore = typeof score === 'number' || score instanceof Number; + if (validScore && H5PIntegration.postUserStatistics === true) { /** * Return unix timestamp for the given JS Date. * From b55c1838a99386e7f5ea258492dc7df0c16e5375 Mon Sep 17 00:00:00 2001 From: Tom Arild Jakobsen Date: Wed, 23 Nov 2016 14:21:28 +0100 Subject: [PATCH 11/41] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9577d19..e8d34a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ vendor *~ - +.idea \ No newline at end of file From b4615e01b18385625d8461b1f5fa0195eebe2bf2 Mon Sep 17 00:00:00 2001 From: Tom Arild Jakobsen Date: Mon, 28 Nov 2016 14:54:33 +0100 Subject: [PATCH 12/41] Allow subContentId in group validation. Relates to: #HFP-285 --- h5p.classes.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/h5p.classes.php b/h5p.classes.php index 4d7223b..03d5136 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -3063,6 +3063,11 @@ class H5PContentValidator { } else { foreach ($group as $key => &$value) { + // If subContentId is set, keep value + if($key == 'subContentId' && $value == TRUE){ + continue; + } + // Find semantics for name=$key $found = FALSE; foreach ($semantics->fields as $field) { From 4d010ef38ff2809e2c52aba07d61ce438261e85e Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Thu, 1 Dec 2016 11:34:28 +0100 Subject: [PATCH 13/41] Improved message presented to user --- h5p.classes.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index 03d5136..dabca7d 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -3132,7 +3132,30 @@ class H5PContentValidator { return; } if (!in_array($value->library, $semantics->options)) { - $this->h5pF->setErrorMessage($this->h5pF->t('Library used in content is not a valid library according to semantics')); + $message = NULL; + // Create an understandable error message: + $machineName = explode(' ', $value->library)[0]; + foreach ($semantics->options as $semanticsLibrary) { + $semanticsMachineName = explode(' ', $semanticsLibrary)[0]; + if ($machineName === $semanticsMachineName) { + // Using the wrong version of the library in the content + $message = $this->h5pF->t('The version of the H5P library %machineName used in this content is not valid. Content contains %contentLibrary, but it should be %semanticsLibrary.', array( + '%machineName' => $machineName, + '%contentLibrary' => $value->library, + '%semanticsLibrary' => $semanticsLibrary + )); + break; + } + } + + // Using a library in content that is not present at all in semantics + if ($message === NULL) { + $message = $this->h5pF->t('The H5P library %library used in the content is not valid', array( + '%library' => $value->library + )); + } + + $this->h5pF->setErrorMessage($message); $value = NULL; return; } From d76ce3f3a567b132c5626622d294d84f10a60cad Mon Sep 17 00:00:00 2001 From: thomasmars Date: Mon, 12 Dec 2016 11:22:34 +0100 Subject: [PATCH 14/41] Applied fix for Safari full screen in version > 9 Big thanks to Lest@t at Drupal for providing the patch. HFP-342 --- js/h5p.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index a505c9c..b266b5e 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -32,7 +32,7 @@ if (document.documentElement.requestFullScreen) { H5P.fullScreenBrowserPrefix = ''; } else if (document.documentElement.webkitRequestFullScreen) { - H5P.safariBrowser = navigator.userAgent.match(/Version\/(\d)/); + H5P.safariBrowser = navigator.userAgent.match(/version\/([.\d]+)/i); H5P.safariBrowser = (H5P.safariBrowser === null ? 0 : parseInt(H5P.safariBrowser[1])); // Do not allow fullscreen for safari < 7. @@ -497,7 +497,7 @@ H5P.semiFullScreen = function ($element, instance, exitCallback, body) { * @param {Object} instance * @param {function} exitCallback Callback function called when user exits fullscreen. * @param {H5P.jQuery} $body For internal use. Gives the body of the iframe. - * @param {Boolean} forceSemiFullScreen + * @param {Boolean} forceSemiFullScreen */ H5P.fullScreen = function ($element, instance, exitCallback, body, forceSemiFullScreen) { if (H5P.exitFullScreen !== undefined) { From a4d6f3aaabd87c40b3d18ba1d82ff3f745353fb0 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Mon, 12 Dec 2016 11:28:23 +0100 Subject: [PATCH 15/41] Restore deprecated variable H5P.canHasFullScreen for backwards compatability HFP-339 --- h5p.classes.php | 2 +- js/h5p.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index 3276151..0d92330 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1676,7 +1676,7 @@ class H5PCore { public static $coreApi = array( 'majorVersion' => 1, - 'minorVersion' => 11 + 'minorVersion' => 12 ); public static $styles = array( 'styles/h5p.css', diff --git a/js/h5p.js b/js/h5p.js index b266b5e..618aae7 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -97,6 +97,15 @@ H5P.init = function (target) { // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe } + // Deprecated variable, kept to maintain backwards compatability + if (H5P.canHasFullScreen === undefined) { + /** + * @deprecated since version 1.11 + * @type {boolean} + */ + H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + } + // H5Ps added in normal DIV. var $containers = H5P.jQuery('.h5p-content:not(.h5p-initialized)', target).each(function () { var $element = H5P.jQuery(this).addClass('h5p-initialized'); @@ -147,6 +156,13 @@ H5P.init = function (target) { }); } + // Check if we should add and display a fullscreen button for this H5P using + // the deprecated variable for backwards compatability. + if (contentData.fullScreen == 1 && H5P.canHasFullScreen) { + H5P.jQuery('

').prependTo($container).children().click(function () { + H5P.fullScreen($container, instance); + }); + } // Create action bar var $actions = H5P.jQuery('
    '); From 7d741fa5032525ca777a8f9b1d877db86413b484 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Tue, 13 Dec 2016 10:16:15 +0100 Subject: [PATCH 16/41] Reset list-style for list items in action bar. HFP-350 --- styles/h5p.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/h5p.css b/styles/h5p.css index e5c5240..35538c7 100644 --- a/styles/h5p.css +++ b/styles/h5p.css @@ -235,6 +235,7 @@ div.h5p-fullscreen { } .h5p-actions > li { margin: 0; + list-style: none; } .h5p-popup-dialog { position: absolute; From 0a23dc043d0ab3195a5db24470235d851e322600 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 13 Dec 2016 10:29:33 +0100 Subject: [PATCH 17/41] Download and embed granularity (HFP-277) --- h5p.classes.php | 142 +++++++++++++++++++++++++++++--------- js/disable.js | 19 ----- js/h5p-action-bar.js | 77 +++++++++++++++++++++ js/h5p-display-options.js | 23 ++++++ js/h5p.js | 103 +++++++-------------------- 5 files changed, 236 insertions(+), 128 deletions(-) delete mode 100644 js/disable.js create mode 100644 js/h5p-action-bar.js create mode 100644 js/h5p-display-options.js diff --git a/h5p.classes.php b/h5p.classes.php index dabca7d..5f8a10a 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -558,6 +558,8 @@ interface H5PFrameworkInterface { * Will trigger after the export file is created. */ public function afterExportCreated(); + + public function hasPermission($permission, $content_id = NULL); } /** @@ -1669,6 +1671,20 @@ Class H5PExport { } } +abstract class H5PPermission { + const DOWNLOAD_H5P = 0; + const EMBED_H5P = 1; +} + +abstract class H5PDisplayOptionBehaviour { + const NEVER_SHOW = 0; + const CONTROLLED_BY_AUTHOR_DEFAULT_ON = 1; + const CONTROLLED_BY_AUTHOR_DEFAULT_OFF = 2; + const ALWAYS_SHOW = 3; + const CONTROLLED_BY_PERMISSIONS = 4; +} + + /** * Functions and storage shared by the other H5P classes */ @@ -1690,7 +1706,8 @@ class H5PCore { 'js/h5p-x-api-event.js', 'js/h5p-x-api.js', 'js/h5p-content-type.js', - 'js/h5p-confirmation-dialog.js' + 'js/h5p-confirmation-dialog.js', + 'js/h5p-action-bar.js' ); public static $adminScripts = array( 'js/jquery.js', @@ -2439,34 +2456,6 @@ class H5PCore { } } - /** - * - */ - public function getGlobalDisable() { - $disable = self::DISABLE_NONE; - - // Allow global settings to override and disable options - if (!$this->h5pF->getOption('frame', TRUE)) { - $disable |= self::DISABLE_FRAME; - } - else { - if (!$this->h5pF->getOption('export', TRUE)) { - $disable |= self::DISABLE_DOWNLOAD; - } - if (!$this->h5pF->getOption('embed', TRUE)) { - $disable |= self::DISABLE_EMBED; - } - if (!$this->h5pF->getOption('copyright', TRUE)) { - $disable |= self::DISABLE_COPYRIGHT; - } - if (!$this->h5pF->getOption('icon', TRUE)) { - $disable |= self::DISABLE_ABOUT; - } - } - - return $disable; - } - /** * Determine disable state from sources. * @@ -2474,7 +2463,7 @@ class H5PCore { * @param int $current * @return int */ - public function getDisable(&$sources, $current) { + public function getDisplayOptionsAsByte(&$sources, $current) { foreach (H5PCore::$disable as $bit => $option) { if ($this->h5pF->getOption(($bit & H5PCore::DISABLE_DOWNLOAD ? 'export' : $option), TRUE)) { if (!isset($sources[$option]) || !$sources[$option]) { @@ -2488,6 +2477,98 @@ class H5PCore { return $current; } + /** + * Determine display options visibility and value on edit + * + * @method getDisplayOptionsForEdit + * @param [int] $disable + * @return [Array] + */ + public function getDisplayOptionsForEdit($disable = NULL) { + $display_options = []; + + $current_display_options = $disable === NULL ? [] : $this->getDisplayOptionsAsArray($disable); + + if ($this->h5pF->getOption('frame', TRUE)) { + $display_options['frame'] = isset($current_display_options['showFrame']) ? $current_display_options['showFrame'] : TRUE; + + $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { + $display_options['download'] = isset($current_display_options['showDownload']) ? $current_display_options['showDownload'] : ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); + } + $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { + $display_options['embed'] = isset($current_display_options['showEmbed']) ? $current_display_options['showEmbed'] : ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); + } + if ($this->h5pF->getOption('copyright', TRUE)) { + $display_options['copyright'] = isset($current_display_options['showCopyright']) ? $current_display_options['showCopyright'] : TRUE; + } + } + + return $display_options; + } + + /** + * Determine display option visibility when viewing H5P + * + * @method getDisplayOptionsForView + * @param [int] $display_options + * @param [int] $id Might be content id or user id. + * Depends on what the platform needs to be able to determine permissions. + * @return [Array] + */ + public function getDisplayOptionsForView($disable, $id) { + $display_options = $this->getDisplayOptionsAsArray($disable); + + if ($this->h5pF->getOption('frame', TRUE) == FALSE) { + $display_options['showFrame'] = false; + } + else { + $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($export == H5PDisplayOptionBehaviour::NEVER_SHOW) { + // If never show globally, force hide + $display_options['showDownload'] = false; + } + elseif ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW || ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_PERMISSIONS && $this->h5pF->hasPermission(H5PPermission::DOWNLOAD_H5P, $id))) { + // If always show or permissions say so, force show + $display_options['showDownload'] = true; + } + + $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($embed == H5PDisplayOptionBehaviour::NEVER_SHOW) { + // If never show globally, force hide + $display_options['showEmbed'] = false; + } + elseif ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW || ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_PERMISSIONS && $this->h5pF->hasPermission(H5PPermission::EMBED_H5P, $id))) { + // If always show or permissions say so, force show + $display_options['showEmbed'] = true; + } + + if ($this->h5pF->getOption('copyright', TRUE) == FALSE) { + $display_options['showCopyright'] = false; + } + } + + return $display_options; + } + + /** + * Convert display options as single byte to array + * + * @method getDisplayOptionsAsArray + * @param [int] $disable + * @return [Array] + */ + private function getDisplayOptionsAsArray($disable) { + return array( + 'showFrame' => !($disable & H5PCore::DISABLE_FRAME), + 'showDownload' => !($disable & H5PCore::DISABLE_DOWNLOAD), + 'showEmbed' => !($disable & H5PCore::DISABLE_EMBED), + 'showCopyright' => !($disable & H5PCore::DISABLE_COPYRIGHT), + 'showAbout' => $this->h5pF->getOption('icon', TRUE), + ); + } + /** * Small helper for getting the library's ID. * @@ -3147,7 +3228,6 @@ class H5PContentValidator { break; } } - // Using a library in content that is not present at all in semantics if ($message === NULL) { $message = $this->h5pF->t('The H5P library %library used in the content is not valid', array( diff --git a/js/disable.js b/js/disable.js deleted file mode 100644 index 0bfbb07..0000000 --- a/js/disable.js +++ /dev/null @@ -1,19 +0,0 @@ -(function ($) { - $(document).ready(function () { - var $inputs = $('.h5p-action-bar-settings input'); - var $frame = $inputs.filter('input[name="frame"], input[name="h5p_frame"]'); - var $others = $inputs.filter(':not(input[name="frame"], input[name="h5p_frame"])'); - - var toggle = function () { - if ($frame.is(':checked')) { - $others.attr('disabled', false); - } - else { - $others.attr('disabled', true); - } - }; - - $frame.change(toggle); - toggle(); - }); -})(H5P.jQuery); diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js new file mode 100644 index 0000000..a80ef60 --- /dev/null +++ b/js/h5p-action-bar.js @@ -0,0 +1,77 @@ +H5P.ActionBar = (function ($, EventDispatcher) { + "use strict"; + + function ActionBar(displayOptions) { + EventDispatcher.call(this); + + var self = this; + + var hasActions = false; + + // Create action bar + var $actions = H5P.jQuery('
      '); + + /** + * Helper for creating action bar buttons. + * + * @private + * @param {string} type + * @param {string} customClass Instead of type class + */ + var addActionButton = function (type, customClass) { + var handler = function () { + self.trigger(type); + }; + H5P.jQuery('
    • ', { + 'class': 'h5p-button h5p-' + (customClass ? customClass : type), + role: 'button', + tabindex: 0, + title: H5P.t(type + 'Description'), + html: H5P.t(type), + on: { + click: handler, + keypress: function (e) { + if (e.which === 32) { + handler(); + e.preventDefault(); // (since return false will block other inputs) + } + } + }, + appendTo: $actions + }); + + hasActions = true; + }; + + // Register action bar buttons + if (displayOptions.showDownload) { + // Add export button + addActionButton('download', 'export'); + } + if (displayOptions.showCopyrights) { + addActionButton('copyrights'); + } + if (displayOptions.showEmbed) { + addActionButton('embed'); + } + if (displayOptions.showAbout) { + // Add about H5P button icon + H5P.jQuery('
      • ').appendTo($actions); + hasActions = true; + } + + self.getDOMElement = function () { + return $actions; + }; + + self.hasActions = function () { + return hasActions; + } + }; + + ActionBar.prototype = Object.create(EventDispatcher.prototype); + ActionBar.prototype.constructor = ActionBar; + + return ActionBar; + +})(H5P.jQuery, H5P.EventDispatcher); diff --git a/js/h5p-display-options.js b/js/h5p-display-options.js new file mode 100644 index 0000000..9c8f664 --- /dev/null +++ b/js/h5p-display-options.js @@ -0,0 +1,23 @@ +/** + * Utility that makes it possible to hide fields when a checkbox is unchecked + */ +(function ($) { + function setupHiding () { + var $toggler = $(this); + + // Getting the field which should be hidden: + var $subject = $($toggler.data('h5p-visibility-subject-selector')); + + var toggle = function () { + $subject.toggle($toggler.is(':checked')); + }; + + $toggler.change(toggle); + toggle(); + } + + $(document).ready(function () { + // Get the checkboxes making other fields being hidden: + $('.h5p-visibility-toggler').each(setupHiding); + }); +})(H5P.jQuery); diff --git a/js/h5p.js b/js/h5p.js index 77f9f0e..5fe8c78 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -47,24 +47,6 @@ else if (document.documentElement.msRequestFullscreen) { H5P.fullScreenBrowserPrefix = 'ms'; } -/** @const {number} */ -H5P.DISABLE_NONE = 0; - -/** @const {number} */ -H5P.DISABLE_FRAME = 1; - -/** @const {number} */ -H5P.DISABLE_DOWNLOAD = 2; - -/** @const {number} */ -H5P.DISABLE_EMBED = 4; - -/** @const {number} */ -H5P.DISABLE_COPYRIGHT = 8; - -/** @const {number} */ -H5P.DISABLE_ABOUT = 16; - /** * Keep track of when the H5Ps where started. * @@ -147,76 +129,41 @@ H5P.init = function (target) { }); } - // Create action bar - var $actions = H5P.jQuery('
        '); - /** - * Helper for creating action bar buttons. - * - * @private - * @param {string} type - * @param {function} handler - * @param {string} customClass Instead of type class + * Create action bar */ - var addActionButton = function (type, handler, customClass) { - H5P.jQuery('
      • ', { - 'class': 'h5p-button h5p-' + (customClass ? customClass : type), - role: 'button', - tabindex: 0, - title: H5P.t(type + 'Description'), - html: H5P.t(type), - on: { - click: handler, - keypress: function (e) { - if (e.which === 32) { - handler(); - e.preventDefault(); // (since return false will block other inputs) - } - } - }, - appendTo: $actions - }); - }; - - // Register action bar buttons - if (!(contentData.disable & H5P.DISABLE_DOWNLOAD)) { - // Add export button - addActionButton('download', function () { - // Use button for download to avoid people linking directly to the .h5p - window.location.href = contentData.exportUrl; - }, 'export'); - } - if (!(contentData.disable & H5P.DISABLE_COPYRIGHT)) { - var copyright = H5P.getCopyrights(instance, library.params, contentId); - - if (copyright) { - // Add copyright dialog button - addActionButton('copyrights', function () { - // Open dialog with copyright information - var dialog = new H5P.Dialog('copyrights', H5P.t('copyrightInformation'), copyright, $container); - dialog.open(); - }); + var displayOptions = contentData.displayOptions; + if (displayOptions.showFrame) { + // Special handling of copyrights + if (displayOptions.showCopyrights) { + var copyrights = H5P.getCopyrights(instance, library.params, contentId); + if (!copyrights) { + displayOptions.showCopyrights = false; + } } - } - if (!(contentData.disable & H5P.DISABLE_EMBED)) { - // Add embed button - addActionButton('embed', function () { - // Open dialog with embed information + + // Create action bar + var actionBar = new H5P.ActionBar(displayOptions); + var $actions = actionBar.getDOMElement(); + + actionBar.on('download', function () { + window.location.href = contentData.exportUrl; + }); + actionBar.on('copyrights', function () { + var dialog = new H5P.Dialog('copyrights', H5P.t('copyrightInformation'), copyrights, $container); + dialog.open(); + }); + actionBar.on('embed', function () { H5P.openEmbedDialog($actions, contentData.embedCode, contentData.resizeCode, { width: $element.width(), height: $element.height() }); }); - } - if (!(contentData.disable & H5P.DISABLE_ABOUT)) { - // Add about H5P button icon - H5P.jQuery('
        • ').appendTo($actions); - } - - // Insert action bar if it has any content - if (!(contentData.disable & H5P.DISABLE_FRAME) && $actions.children().length) { $actions.insertAfter($container); + } + + if (displayOptions.showFrame && actionBar.hasActions()) { $element.addClass('h5p-frame'); } else { From 52dc1b2a81f0a5dd4e20e0aac3b5ad0465527c5b Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Tue, 13 Dec 2016 10:33:11 +0100 Subject: [PATCH 18/41] Refactor canHasFullScreen HFP-339 --- js/h5p.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index 618aae7..559b80b 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -156,13 +156,6 @@ H5P.init = function (target) { }); } - // Check if we should add and display a fullscreen button for this H5P using - // the deprecated variable for backwards compatability. - if (contentData.fullScreen == 1 && H5P.canHasFullScreen) { - H5P.jQuery('
        ').prependTo($container).children().click(function () { - H5P.fullScreen($container, instance); - }); - } // Create action bar var $actions = H5P.jQuery('
          '); From e69a81f4039d5c84fd53821a36d82e347a5479d4 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 13 Dec 2016 10:33:59 +0100 Subject: [PATCH 19/41] Added description of new interface method [HFP-277] --- h5p.classes.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index 5f8a10a..ddb48b6 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -559,7 +559,15 @@ interface H5PFrameworkInterface { */ public function afterExportCreated(); - public function hasPermission($permission, $content_id = NULL); + /** + * Check if user has permissions to an action + * + * @method hasPermission + * @param [H5PPermission] $permission Permission type, ref H5PPermission + * @param [int] $id Id need by platform to determine permission + * @return boolean + */ + public function hasPermission($permission, $id = NULL); } /** From a326066c97dd4d226f2bc72cdfc5410438704918 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Tue, 13 Dec 2016 11:36:28 +0100 Subject: [PATCH 20/41] Only set tutorial url if it exists. HFP-348 --- h5p.classes.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index 0d92330..b003a27 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2423,7 +2423,9 @@ class H5PCore { // Handle libraries metadata if (isset($json->libraries)) { foreach ($json->libraries as $machineName => $libInfo) { - $this->h5pF->setLibraryTutorialUrl($machineName, $libInfo->tutorialUrl); + if (isset($libInfo->tutorialUrl)) { + $this->h5pF->setLibraryTutorialUrl($machineName, $libInfo->tutorialUrl); + } } } From cddef832879788f1eb579fced0ad91057cefcf4e Mon Sep 17 00:00:00 2001 From: jelenamilinovic Date: Tue, 13 Dec 2016 13:43:25 +0100 Subject: [PATCH 21/41] Add files via upload --- fonts/h5p-core-16.eot | Bin 0 -> 8096 bytes fonts/h5p-core-16.svg | 42 +++++++++++++++++++++++++++++++++++++++++ fonts/h5p-core-16.ttf | Bin 0 -> 7932 bytes fonts/h5p-core-16.woff | Bin 0 -> 8008 bytes 4 files changed, 42 insertions(+) create mode 100644 fonts/h5p-core-16.eot create mode 100644 fonts/h5p-core-16.svg create mode 100644 fonts/h5p-core-16.ttf create mode 100644 fonts/h5p-core-16.woff diff --git a/fonts/h5p-core-16.eot b/fonts/h5p-core-16.eot new file mode 100644 index 0000000000000000000000000000000000000000..239079bac7fcb443abd2063703ed61bab0a9b3b9 GIT binary patch literal 8096 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 literal 0 HcmV?d00001 diff --git a/fonts/h5p-core-16.svg b/fonts/h5p-core-16.svg new file mode 100644 index 0000000..1240927 --- /dev/null +++ b/fonts/h5p-core-16.svg @@ -0,0 +1,42 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/h5p-core-16.ttf b/fonts/h5p-core-16.ttf new file mode 100644 index 0000000000000000000000000000000000000000..daf157117573b9cc4baba149f16cb136104f217b GIT binary patch literal 7932 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%0DU=~7luN=L83 zb&g*~B^Ljl<<}W6zeeQDkI*nVu;~x!-QMLtCvF%dJl{R?@u#on(Eb>rZv5XT=E8Xp zi#z|D5xGN@r7;nm-|)26IMwO|8Om2ALhnZc?4%Q@TaY{GQ%D~}I*Akq#~&b1A&L4W zNQaP)A$v!!G0sl4y$~Z9_U;E7MP*TEwwI{NvG$-8q4O8a|JI zIe$tsbSE>|St%hMmYd`Q@;@s+x%o`?(Z1yHtsW?_u&5$ zXS8k9zzvmn8d`A*^^ZxuP}d2?zg;y7fvKY3ny$pZVC6b20X|ZPW#|5*hNGZi5}QDIStMiq z{m;*X2-<_d+eFed*__{hHNxepsXnYxQ3rTsV9L{atpAj|1Y;W_pgugs=`lalTG1fMO^Ua139;6(bUvM;<0VP!!NwUfcEB zhkrm{fAsYay?*`;^XlT&t0;$_*XCY3`vda&Y0%HUK^!{0dO7lBs@;bHFiWni4Tb-s}Z}0D;U7<1$vnT;ypp{->-PJ2BTD<~=l-^GsWhdDa zqO9ElN|i^MQT>%uMrbo9Y>OCUovK+i%g~UOFTJ#qZMo{?kjD$2Rf31wI<463rIlBS zC}yhw2!7}?=t&Z0_w&8ztBO_YB>`fSC`pnu$&xP81Lz~b`k9) zG-a|-Fv09nI+YouyrGi>{UJ}OZx5IYs<-H zYqpixMSS~mn@5)G-*PFRR@F}{u5anfM>gjmCRR45A0uDo=h=%Go2I4p6$=AQ)F4Kt z6iAnfC8SU>#GVk6LTl+Rk>9m#dis5zFBBeL#$E(gs#Bf3cVwjc!Qzv}SBiwuQ{)-` z3HD8rAf1@?>;QGzU+-P9P_EeF0{YjNZBJ!NedS^y911G@6NiF!+u)X-{FZ_C_JJ+= z_BFA?l3PkiQuUQJ_uR7v=|_j+t26oO!M3)+={)jwJ9JnAhaqj6852BXGlaNkocy(9 zu&)sVJ19+-lYX+AY$SJ*9b^upT+Z~+loGNNbdaj`mh@0LTt<^JY1O1jnpKq`1|N-7 zm2i?4$~`nky|j|eq`XuVwP%!&8VnaJ1GIoMK z!(5ka&WGvuxJ=ztkq%0X&#xZl+~zJmyiV{+3QCqTSF>C(WceCv6W96hY4$&h7W?Yr zKK3}f6UvO=qU-JT{`v+^M^(Mnw{z0j#a}U{nx%hHg;mCG`aUJn7<-T`Be#&dFnT$P z6`58CXr&y+#9&zgEz*DWpHA4S2Zdc!tU7H!78w$|9wx=GD;;-s(qVJc=F1_GpSjL32pQxXC(m>0VT;7?9C4 zpDOs#Fn8ERDSb}$D5zfXsNO{2pAC3**!z#duYAPuE4N(tVhyhn2nS&^Q$5%i_+E_6)^->{6lAj$0c-{KpTaM2FK+V^FC!`dt1LB|nXxAptyW;TbnP*A|6x@*v-;dN4jmCvso z!mbc*Wbt*W!OG`Hhb8zHxQ6v~fAujsRQ(YRu*%yQgqwk`$(vPMeHmV+RxLczP+b>% zL#>5M&3lO!4$+}E-~7fWKZz;FoFB##{0e&jvFfdu^8}64pd!5FD%vL;X;|QOUnzWK ztsq%vL_wy;$hLA>=C4Y4UKP*^msUs|0gNscBo}*vao{@JhgCg4 z&lJ8FeOw_i_BiqaM(R9cazAnrNlWxN`3C<2dm6D}h^!!p&z$LT;t)7}c%Lp1;?z!| z)i7*%1!lcB=d`?50&m}1D5KTjl$XRU^cOB!xu96e$5ch%>2Zzg=1YoKnv^`Us;R2% z0q9lUuj;zWniO4EPFDZK@c9fR=60(uXxa;^+jYienyxdCsPZ-l;PC)}7dk5h&Z_!h z%WYVe;kM8hO211v-^A{BVz_Iu$FpQg`(kg?9Jt=;%tin52yFAD1+qh~;8E!HIWG$S!sHrePRnO^+0tG|TO_RL!ru z+%R68Q~Frc?~g=~IJdm%wrv&Nql_IGlQcPVr$_TTDmZloi|dvLvw=t80D2}KPpPy`g(A>44qq1ck(35yOWw9|fC1k!i~Q%xX7 zZMfiCqwqyr`pUI-i7$J#vaqmFp)TFCEGDTO20xtg*g-~XbjD?OF2fZGR=j1osS9h4 zZK=CFU2qm~fF3oRaA_LrzJ2S~Zc5!QPiGPZu>Ddb?FN7M)~&a9SASUCRpjvKLBs9m z@G?GcOS?)3?;B*A;)(}77G{W2uSYc%-K(6ToVg;dM1L$h9N`Me5Q}w2x@Y=ekpV|n zM$31mppUZVHJ#1nn3?u=$+{FTN7`>iK+TM159SETJe!cN4)wmxdSz#HcWULbzv$?s0j-X=0@zVP_`AJ zvq?ji6LkqAghKEL*0kJ+zeN-Z(VAo-OyO-RHnsUrJ%$nYzje_{7=S#0`LGrDxINQv zU6f=*NBAK=7)DqmV5aiLkDFevX|{zzX#fD*f}u7xw3zOp~skSOl{+v7DprDn;cpwhy$tUV*zef zbP`nBH^7R81TGI06{h0t=WU>s951zsD+K2V9=2hjN&~zh5rnUX2v&h6=`pWnDlY6Q znRg}=U0T2u@6y!$uB7$NKthg45^awzezv&v-J_%L-dbFqF>F1%ynpWDsmX_T_Qy)M zb-S9)?scUEt7M1oC=~7(&hEIaJVukHiH?r(ax&ILyGt}gsexUsyXjz}yEFN5S?)?e z(MLQ!+rQV_>Klk;X|K>P>KRz*V!E1t&*qsUu zvbC`BeRe)PJ0R*vmd87?t0ORhJ*l}B7*6cB3H~OxNe1@4w$W0!1HfpB4cAy(abfK1 z=T(cpY3NX(n$qR%qtzp$+qaL>4~=fWEPFtdbmIZHA91!UU)okLy8G_YZI@(NG|BH? z{3QIP>+0WOkAImwO#T>6z{nXUd)|{j6{4SuL>s~Yzv%y+{6`eqDqfbyq(nnyaWxee`@Wa?JhCu~S)Wdy4S zp5ji(22A~&=3$yDLG%tum#iHI$0I}y8KTV4s>$4@Rq6DqO}U<0-ov7PE9tYlY@E>~ zjm7(Ij%aU#`#Vk>^CY4ciY~$&riMTInAVwYZ=Wga3j*PlCAl5E0L{ z+pF4LS=zc`ECb^H=UNOV;z~?5X1y=fo2AwHXHRd~aQfN#J?xVv1w`+*6OSGGU!kKI$d`ulfHbvJT;aft#)QI$Z$ zSY4CItB`~I_DUnKetM|}XoB5jBu;MOZ{ePCfNVzJDvMsY-80gy**>#bdyWYO zxIAFbX<^G3ku#IAE)F#czi@#oh^(r=vX{jze_~na)D!|NHgyVfxt)B5e~vR^qSyWK z6ONa#Y8H#boQNQS*H8;+mWRveNG~pD61>9m85oY<+PCIMRL2B?+C>93vD!DFWY}XZ zE1F}sw3McM^DPsp>gBeHRK9mhDb*iu9!P#?b?M0L#&vgWj*YKb6&QUew|dW^p6Mg( z18r-UEn6E+j4#Vfw%Pe+zM^ACPiCs6Wh#@qyK^Ag%f4b+)$@ig8lopn%k)+s2t`dV z-5u~-i&w1M7#|qpG?6fUEWC=bbSIN4)s$sLell$;^! z_)%WMeKumYx36S=w13y>sj1Uq>D6+2aVZ9>@V&UdsK~kV7*$W|Puf;lYj>z(sbX=8 zlQAs$3M&2wSc*IGVBB$1;b4g0T*zT!dtj9{`AJ!kWGq{Np%7qUg#jM}$Rvl5#erFq zH#&qRAnnddSkDqjx|9`?(y?oBUE`NP#Nyw(^19-c*Myw;5hF|vZvI1hw|C{wi5mt9 z&v%Y~{K@M%Mt=-ZxA;#`+$D(zvAFZU8Id~#D%Jmu6mb1%t7)oXLJas7iO~Cz06Xa< zXp3?O{V3AMkWL}Rq4E33Q%Hio4Cye^ais5p|BH}q6}pi`YYn7_>aYvBf+Wh~NZXOl z)NuMKkVPCD#6KS0*qxL3r{Qzt1@aS`p}UyD&PfUBh}bHXDfg)ls$bCtv={XQ z`k%Q@yRNw3>HfCyPUAk~Sr7g%5&b7^)W8jucp9VPAoY()KJRb|UKKPUAvjgkTZ6^F zVC6b20X|xXW#|5*#-o6~u1 Date: Tue, 13 Dec 2016 13:45:48 +0100 Subject: [PATCH 22/41] Delete h5p-core-15.eot --- fonts/h5p-core-15.eot | Bin 5168 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fonts/h5p-core-15.eot diff --git a/fonts/h5p-core-15.eot b/fonts/h5p-core-15.eot deleted file mode 100644 index 5a51b7221e45d6e34ce98293705d05ca207b6a73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5168 zcma)A32a=)d7kUdylaoQ+}%emce%@5a#y6NCAp`qi=r)2icKPk4oihB)RaVtu@0)D z1W2x3E0LW;G88pFRm5=+H$_{tX@jC^k=llu7y*K`sUf5dTEGR;#;L3zZ4tmlkV30| z^L9y*wuAKH&CLJ*^Upv3oZrlh#R>Uh7a^1|vihUsD%FzdkFAz#-S&6rjVE7!e;y%{ z%#%7fg^V!SN#@8=a+Vw?v*a`+N%9aRr^zDu1X&;_Nsf$@GQ!GIU~~lzxj;A>`{=IG zN+c%#43gIn9yxSk_S9QHe`)|qY4A@Son6#bMZtd=sd@DH`6J(a`sjJ^e@IB=`25`L zVb}TV_XzROQqq`*z%&gs)|&=DFn{9Axr5*C_P}d9j~rh(G~555nJ<8U3w-6o?7359 zkcJ6~3Glg-vnS@B`LPQRW7>y@PAx2+fuH!g9@qJVi;MIsF$iJT*xy0&`F2WwN~+Y- zdMiE(w^x5#2zi(B>vyh`EgS)vx-XW#TtMjBbVwtwo$^2{O$54LcXAYR30dx)Bkz3v zC-ml}o6p>Q?p=20_MJO{h1@%H?_Bu_x%pYhue?hFIlc4msaI0xQl|eY|C9a&KLHyn z>kbNbB1$MMMONgaKb!Xk>UYchI@v91@FeTi6R)eE-eM!ITdcQr3w2QX1i8d6vKMsT zpa+)9OU!NkGRPyehZD9(_pwD)NtGBJ+4$z08`+*aL5lMDp|eTrP~W0WpS`*94$;|c z69}yjTQ0pwlI#ioDB7wp<07Ps_@tL)Nr9BeS~7~#)kL9*p#GmJy|{h*U;MhCKe~PU z_B}f6*s)_bLO_Gp?IX9zzj4ma1iqJ)PfPSWXLo;>ZrV*RpWTCW4;uF(`7VE!U5B59 z=EE!z?_++wkS|WqMkPy=axG14=Ji^c71(pN1KUb{jR!{dTEh6W5s^BMc`?mb5QeTz!_pNpJ?JA?#8u-KMOXOSpIrawnrh8?5)yih3YtTJY z?<&-*b%aDU!CufMwblB=I(_)S?%hv*ty1~)8ukXbdPf?hl_^)JvOb;D4ue)k>r3Co5=Qtu&Y~)@zMwC7Fmz{_^R#KQOUpbZpP&!NJXY z#s;^g7lkA8LbPsdJ9uy#!p}};wid^BPYeu9>>fip=qDBhG+eQBc1r6^%@ShM40&C+ z?Aye}3M!CwWIfqRK2G+NN3dlP+9;0FyiE9gbb_jmC!^FzHsDgRpu#juOG?Jk`EXLn zWR_MMqqIyTv{@?VBUEP%7G*-klhx*CI!gU!qc%!)7WewSev07H|K?1bG7J|>WB$QO zZV8|BN&3&+pbnMdlwf>*>m=tsxB29QT31NqtW<85xO5F;S+$#6eDbsGzixZ%Tepv~ z=h=Q3bAN@c)%E`G`!oYnomy9G(nGg@$z-cU|D?5B&l&O~O2ibqK-Q3Z$iwKpGR2H6 zsLiz5NMhj7ix@j}n*OVGJ-8U|MzI8bEd{@%VdSMMH4B(w1rK_OYMGYWf3uIGSiM#( zh*ESc_xvA)t)yjnW@a?z#VpI}jjE8kGBr?-c^-{MXH~aXD0#jirBtndiT0?Y<-?Di zJNMZ0A>XniQd;7u>WL<@*#w)7L}xY$#TfNs-bkuz!1K};XXCQ!Ya6}7BnC=!ZhlgTU*G*4cJp?67xJW75{9rQ%9(`+o(5`HwM zm@l9gWSiCqD%;qxh83nOUMd0trAmH$Y&;p)6=N*~F=$=KatmO>=j~FJF(2Y# zT0nkLMrb@R2NC$@Si={JG8!%VHpa`9l+((QDit&~*ws~x*(AaWvqW&o^k#$WiY{{BVCXFhG)?~WsG@o zT|55r{xUTzLm=C;%_y^dmkW6A`Yxq1ETQrbrs3M%QEt1T9+&d4V|OXTH1ONZNmhEi zoTnnTbPN?yAtQ92yVr>Fb2$4p&W&m->_S@K2 z(oh48L%Pc_@b@V5oN zw>5Q5h-);)skrt&IsG`Z#0J4}fU!hH*z5(y!CUMYX7&6$ll)P%af4v&d88He)N_m( z>yhe{w4mq7_xPW)-^bZ7K{gPa&w}9z&LIGOpwC(eGStt*Yiw*|65INCIq`aiZIuSrk7q@;B?WN){^Z_0?679m5KN*N)L5&0=)S&DT_%aRvcUvZ;R z7lApBdd)OnQ;vPv4u|c_pHs#G6u=h(0TjBT3tUmwqUX4t=Q_CE;LP|#%K1+AL~w>% zK6@;mO_t9tOQ$UMAIFp$Q*m|t7@{$yj&=BB$J;!;eoQ6QXggyRBotQhIK6+JoaGxh z$0=YdTxf%sTtXEfSR3`qSmk9_DmI#J7z&O9a8U!xW?IEc=|Fu^(vjLDLu<1(6LR~B z?ZV`J>2i8BzT>xc7`9rsa}pb~X{D;&rsp`GGGmtQVDsXf(r0^Pu~Z6yb1zaDIMB30 za_Z!iFpc8=kQoU~aB9b^53Y-sx>A)ChQYKv%PHBt^w^>H~t?P9cUbwMN@79kaKa3kwTP zYFnW-X`wha{A51l#~E$Q88@7AkxPMHJhv`v>D?U5(y~Kq0TuwjkV^L1rpZS3?%Ov) zsbhzRv&g{SFH!{u`Xl@H?Hy_Tw0fk=&L9liknt43K$Rd zgc3PBxpf%$9LgbXbH2x%Tc%hw<*BAiF~A@skFvi-}pZ4$@LZUncgY22v( z7_T`$r$u^%x$LUw6K9NWt<#qFJ4m}- z3^(~p9XZEM2I*nQ4wCbTKSB;cYX(8To|PY(JH7acg_F7Q^7w~8tS#5O aOzfOHdiMD2>D4cD%em-TzOsuyNdF)4)VB)& From c442300cabf6af5cc272547cd67b94520a7cbcda Mon Sep 17 00:00:00 2001 From: jelenamilinovic Date: Tue, 13 Dec 2016 13:45:55 +0100 Subject: [PATCH 23/41] Delete h5p-core-15.svg --- fonts/h5p-core-15.svg | 46 ------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 fonts/h5p-core-15.svg diff --git a/fonts/h5p-core-15.svg b/fonts/h5p-core-15.svg deleted file mode 100644 index 3a440df..0000000 --- a/fonts/h5p-core-15.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - -{ - "fontFamily": "h5p", - "description": "Font generated by IcoMoon.", - "majorVersion": 1, - "minorVersion": 1, - "version": "Version 1.1", - "fontId": "h5p", - "psName": "h5p", - "subFamily": "Regular", - "fullName": "h5p" -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 26cedf7d70c088f4d5c64af241ad96d2a429e7ee Mon Sep 17 00:00:00 2001 From: jelenamilinovic Date: Tue, 13 Dec 2016 13:45:58 +0100 Subject: [PATCH 24/41] Delete h5p-core-15.ttf --- fonts/h5p-core-15.ttf | Bin 5020 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fonts/h5p-core-15.ttf diff --git a/fonts/h5p-core-15.ttf b/fonts/h5p-core-15.ttf deleted file mode 100644 index d3a9a27a77cabd64a96df07d6f000077fd64c3c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5020 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 ZMRq}bj+`OK(Z;EjT8u1TJ;d*&{~z6zsn-Ai From 1058dab02d9ffbdbc2a2dd9c6f5ca0512d766740 Mon Sep 17 00:00:00 2001 From: jelenamilinovic Date: Tue, 13 Dec 2016 13:46:02 +0100 Subject: [PATCH 25/41] Delete h5p-core-15.woff --- fonts/h5p-core-15.woff | Bin 5096 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fonts/h5p-core-15.woff diff --git a/fonts/h5p-core-15.woff b/fonts/h5p-core-15.woff deleted file mode 100644 index fa8d5b067ca91876764dca20068333248065fb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5096 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 Date: Tue, 13 Dec 2016 15:57:05 +0100 Subject: [PATCH 26/41] Fixed download/embed button bug when permissions are used --- h5p.classes.php | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index ddb48b6..d32ee12 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2516,6 +2516,30 @@ class H5PCore { return $display_options; } + /** + * Helper function used to figure out embed & download behaviour + * + * @method setDisplayOptionOverrides + * @param string $option_name + * @param H5PPermission $permission + * @param int $id + * @param bool &$value + */ + private function setDisplayOptionOverrides($option_name, $permission, $id, &$value) { + $behaviour = $this->h5pF->getOption($option_name, H5PDisplayOptionBehaviour::ALWAYS_SHOW); + // If never show globally, force hide + if ($behaviour == H5PDisplayOptionBehaviour::NEVER_SHOW) { + $value = false; + } + elseif ($behaviour == H5PDisplayOptionBehaviour::ALWAYS_SHOW) { + // If always show or permissions say so, force show + $value = true; + } + elseif ($behaviour == H5PDisplayOptionBehaviour::CONTROLLED_BY_PERMISSIONS) { + $value = $this->h5pF->hasPermission($permission, $id); + } + } + /** * Determine display option visibility when viewing H5P * @@ -2532,25 +2556,8 @@ class H5PCore { $display_options['showFrame'] = false; } else { - $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); - if ($export == H5PDisplayOptionBehaviour::NEVER_SHOW) { - // If never show globally, force hide - $display_options['showDownload'] = false; - } - elseif ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW || ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_PERMISSIONS && $this->h5pF->hasPermission(H5PPermission::DOWNLOAD_H5P, $id))) { - // If always show or permissions say so, force show - $display_options['showDownload'] = true; - } - - $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); - if ($embed == H5PDisplayOptionBehaviour::NEVER_SHOW) { - // If never show globally, force hide - $display_options['showEmbed'] = false; - } - elseif ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW || ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_PERMISSIONS && $this->h5pF->hasPermission(H5PPermission::EMBED_H5P, $id))) { - // If always show or permissions say so, force show - $display_options['showEmbed'] = true; - } + $this->setDisplayOptionOverrides('export', H5PPermission::DOWNLOAD_H5P, $id, $display_options['showDownload']); + $this->setDisplayOptionOverrides('embed', H5PPermission::EMBED_H5P, $id, $display_options['showEmbed']); if ($this->h5pF->getOption('copyright', TRUE) == FALSE) { $display_options['showCopyright'] = false; From f0d65d4f9d9af7bfdd613fa4cdc75b67f0bb4028 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Tue, 13 Dec 2016 16:04:57 +0100 Subject: [PATCH 27/41] Refactor canHasFullscreen HFP-339 --- js/h5p.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 559b80b..b49f412 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -103,7 +103,7 @@ H5P.init = function (target) { * @deprecated since version 1.11 * @type {boolean} */ - H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + H5P.canHasFullScreen = HFP.fullscreenSupported; } // H5Ps added in normal DIV. From bbe16fb8daf38b2fac32df0889d98c1c31cd8ea5 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Tue, 13 Dec 2016 19:46:21 +0100 Subject: [PATCH 28/41] Revert changes for canHasFullScreen HFP-339 --- js/h5p.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index b49f412..559b80b 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -103,7 +103,7 @@ H5P.init = function (target) { * @deprecated since version 1.11 * @type {boolean} */ - H5P.canHasFullScreen = HFP.fullscreenSupported; + H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; } // H5Ps added in normal DIV. From 5a272ea2f1f024a7164e0bb4a5f675cb1a6f1509 Mon Sep 17 00:00:00 2001 From: Andreas Nergaard Date: Wed, 14 Dec 2016 09:32:57 +0100 Subject: [PATCH 29/41] Fixed broken font referrance and metadata after font update. --- fonts/h5p-core-16.svg | 20 ++++++++++++++++++-- styles/h5p.css | 10 +++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/fonts/h5p-core-16.svg b/fonts/h5p-core-16.svg index 1240927..d0bdb88 100644 --- a/fonts/h5p-core-16.svg +++ b/fonts/h5p-core-16.svg @@ -1,7 +1,23 @@ -Generated by IcoMoon + + + +{ + "fontFamily": "h5p", + "description": "Font generated by IcoMoon.", + "majorVersion": 1, + "minorVersion": 1, + "version": "Version 1.1", + "fontId": "h5p", + "psName": "h5p", + "subFamily": "Regular", + "fullName": "h5p" +} + + + @@ -39,4 +55,4 @@ - \ No newline at end of file + diff --git a/styles/h5p.css b/styles/h5p.css index 35538c7..2e5842e 100644 --- a/styles/h5p.css +++ b/styles/h5p.css @@ -3,11 +3,11 @@ /* Custom H5P font to use for icons. */ @font-face { font-family: 'h5p'; - src: url('../fonts/h5p-core-15.eot?1a4hhb'); - src: url('../fonts/h5p-core-15.eot?1a4hhb#iefix') format('embedded-opentype'), - url('../fonts/h5p-core-15.ttf?1a4hhb') format('truetype'), - url('../fonts/h5p-core-15.woff?1a4hhb') format('woff'), - url('../fonts/h5p-core-15.svg?1a4hhb#h5p-core-15') format('svg'); + src: url('../fonts/h5p-core-16.eot?80e76o'); + src: url('../fonts/h5p-core-16.eot?80e76o#iefix') format('embedded-opentype'), + url('../fonts/h5p-core-16.ttf?80e76o') format('truetype'), + url('../fonts/h5p-core-16.woff?80e76o') format('woff'), + url('../fonts/h5p-core-16.svg?80e76o#h5p-core-15') format('svg'); font-weight: normal; font-style: normal; } From 28e34c1c093815aa0243581a17d9c2ecf13b3859 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Wed, 14 Dec 2016 16:21:42 +0100 Subject: [PATCH 30/41] Simplify fullscreenSupported HFP-339 --- js/h5p.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index 559b80b..7e5c068 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -92,7 +92,7 @@ H5P.init = function (target) { * fullscreen, and the semi-fullscreen solution doesn't work when embedded. * @type {boolean} */ - H5P.fullscreenSupported = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + H5P.fullscreenSupported = !(H5P.isFramed && H5P.externalEmbed !== false) || !!(document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled); // We should consider document.msFullscreenEnabled when they get their // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe } @@ -103,7 +103,7 @@ H5P.init = function (target) { * @deprecated since version 1.11 * @type {boolean} */ - H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true; + H5P.canHasFullScreen = H5P.fullscreenSupported; } // H5Ps added in normal DIV. From 526d7ddd7e211eaa425bca6cf7b1ef5b6e5dff0b Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 16 Dec 2016 11:30:59 +0100 Subject: [PATCH 31/41] Made copyright button being shown [HFP-277] --- js/h5p-action-bar.js | 2 +- js/h5p.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js index a80ef60..8d30101 100644 --- a/js/h5p-action-bar.js +++ b/js/h5p-action-bar.js @@ -48,7 +48,7 @@ H5P.ActionBar = (function ($, EventDispatcher) { // Add export button addActionButton('download', 'export'); } - if (displayOptions.showCopyrights) { + if (displayOptions.showCopyright) { addActionButton('copyrights'); } if (displayOptions.showEmbed) { diff --git a/js/h5p.js b/js/h5p.js index 5fe8c78..4af85e9 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -135,10 +135,10 @@ H5P.init = function (target) { var displayOptions = contentData.displayOptions; if (displayOptions.showFrame) { // Special handling of copyrights - if (displayOptions.showCopyrights) { + if (displayOptions.showCopyright) { var copyrights = H5P.getCopyrights(instance, library.params, contentId); if (!copyrights) { - displayOptions.showCopyrights = false; + displayOptions.showCopyright = false; } } From a1e68d212b907c58aa5e300cafa3cadeb0e4d771 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 16 Dec 2016 11:38:47 +0100 Subject: [PATCH 32/41] Updated comments [HFP-277] --- h5p.classes.php | 28 ++++++++++++---------------- js/h5p-action-bar.js | 12 ++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index d32ee12..7a71041 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2488,9 +2488,8 @@ class H5PCore { /** * Determine display options visibility and value on edit * - * @method getDisplayOptionsForEdit - * @param [int] $disable - * @return [Array] + * @param int $disable + * @return array */ public function getDisplayOptionsForEdit($disable = NULL) { $display_options = []; @@ -2519,11 +2518,10 @@ class H5PCore { /** * Helper function used to figure out embed & download behaviour * - * @method setDisplayOptionOverrides - * @param string $option_name - * @param H5PPermission $permission - * @param int $id - * @param bool &$value + * @param string $option_name + * @param H5PPermission $permission + * @param int $id + * @param bool &$value */ private function setDisplayOptionOverrides($option_name, $permission, $id, &$value) { $behaviour = $this->h5pF->getOption($option_name, H5PDisplayOptionBehaviour::ALWAYS_SHOW); @@ -2543,11 +2541,10 @@ class H5PCore { /** * Determine display option visibility when viewing H5P * - * @method getDisplayOptionsForView - * @param [int] $display_options - * @param [int] $id Might be content id or user id. - * Depends on what the platform needs to be able to determine permissions. - * @return [Array] + * @param int $display_options + * @param int $id Might be content id or user id. + * Depends on what the platform needs to be able to determine permissions. + * @return array */ public function getDisplayOptionsForView($disable, $id) { $display_options = $this->getDisplayOptionsAsArray($disable); @@ -2570,9 +2567,8 @@ class H5PCore { /** * Convert display options as single byte to array * - * @method getDisplayOptionsAsArray - * @param [int] $disable - * @return [Array] + * @param int $disable + * @return array */ private function getDisplayOptionsAsArray($disable) { return array( diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js index 8d30101..aba17e3 100644 --- a/js/h5p-action-bar.js +++ b/js/h5p-action-bar.js @@ -60,10 +60,22 @@ H5P.ActionBar = (function ($, EventDispatcher) { hasActions = true; } + /** + * Returns a reference to the dom element + * + * @method getDOMElement + * @return {H5P.jQuery} + */ self.getDOMElement = function () { return $actions; }; + /** + * Does the actionbar contain actions? + * + * @method hasActions + * @return {Boolean} + */ self.hasActions = function () { return hasActions; } From ea0362c3da73e5a3d5aa3b731a22adbc7f4890b8 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 16 Dec 2016 13:27:40 +0100 Subject: [PATCH 33/41] Making lines shorter [HFP-277] --- h5p.classes.php | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index 7a71041..302242e 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2499,16 +2499,32 @@ class H5PCore { if ($this->h5pF->getOption('frame', TRUE)) { $display_options['frame'] = isset($current_display_options['showFrame']) ? $current_display_options['showFrame'] : TRUE; + // Download $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); - if ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { - $display_options['download'] = isset($current_display_options['showDownload']) ? $current_display_options['showDownload'] : ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); + if ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || + $export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { + $display_options['download'] = + isset($current_display_options['showDownload']) ? + $current_display_options['showDownload'] : + ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); } + + // Embed $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); - if ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { - $display_options['embed'] = isset($current_display_options['showEmbed']) ? $current_display_options['showEmbed'] : ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); + if ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || + $embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { + $display_options['embed'] = + isset($current_display_options['showEmbed']) ? + $current_display_options['showEmbed'] : + ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); } + + // Copyright if ($this->h5pF->getOption('copyright', TRUE)) { - $display_options['copyright'] = isset($current_display_options['showCopyright']) ? $current_display_options['showCopyright'] : TRUE; + $display_options['copyright'] = + isset($current_display_options['showCopyright']) ? + $current_display_options['showCopyright'] : + TRUE; } } From 7b39a6900c5ca330dabd14a123ee070b67c674d5 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 16 Dec 2016 13:29:18 +0100 Subject: [PATCH 34/41] Inheriting global disable setting for export & embed when saving [HFP-277] --- h5p.classes.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index 302242e..08f2a8e 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2465,21 +2465,33 @@ class H5PCore { } /** - * Determine disable state from sources. + * Create representation of display options as int * * @param array $sources * @param int $current * @return int */ - public function getDisplayOptionsAsByte(&$sources, $current) { + public function getStorableDisplayOptions(&$sources, $current) { + // Download - force setting it if always on or always off + $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW || + $export == H5PDisplayOptionBehaviour::NEVER_SHOW) { + $sources['download'] = ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW); + } + + // Embed - force setting it if always on or always off + $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW || + $embed == H5PDisplayOptionBehaviour::NEVER_SHOW) { + $sources['embed'] = ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW); + } + foreach (H5PCore::$disable as $bit => $option) { - if ($this->h5pF->getOption(($bit & H5PCore::DISABLE_DOWNLOAD ? 'export' : $option), TRUE)) { - if (!isset($sources[$option]) || !$sources[$option]) { - $current |= $bit; // Disable - } - else { - $current &= ~$bit; // Enable - } + if (!isset($sources[$option]) || !$sources[$option]) { + $current |= $bit; // Disable + } + else { + $current &= ~$bit; // Enable } } return $current; From 87ec43d687f21903b5332ee853ede13adcfed7e0 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Fri, 16 Dec 2016 14:22:03 +0100 Subject: [PATCH 35/41] Using constants for the different display options, and avoid special cases [HFP-277] --- h5p.classes.php | 79 ++++++++++++++++++++++++-------------------- js/h5p-action-bar.js | 8 ++--- js/h5p.js | 8 ++--- 3 files changed, 52 insertions(+), 43 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index 08f2a8e..72d84b6 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1738,12 +1738,18 @@ class H5PCore { const DISABLE_COPYRIGHT = 8; const DISABLE_ABOUT = 16; + const DISPLAY_OPTION_FRAME = 'frame'; + const DISPLAY_OPTION_DOWNLOAD = 'export'; + const DISPLAY_OPTION_EMBED = 'embed'; + const DISPLAY_OPTION_COPYRIGHT = 'copyright'; + const DISPLAY_OPTION_ABOUT = 'icon'; + // Map flags to string public static $disable = array( - self::DISABLE_FRAME => 'frame', - self::DISABLE_DOWNLOAD => 'download', - self::DISABLE_EMBED => 'embed', - self::DISABLE_COPYRIGHT => 'copyright' + self::DISABLE_FRAME => self::DISPLAY_OPTION_FRAME, + self::DISABLE_DOWNLOAD => self::DISPLAY_OPTION_DOWNLOAD, + self::DISABLE_EMBED => self::DISPLAY_OPTION_EMBED, + self::DISABLE_COPYRIGHT => self::DISPLAY_OPTION_COPYRIGHT ); /** @@ -2473,17 +2479,17 @@ class H5PCore { */ public function getStorableDisplayOptions(&$sources, $current) { // Download - force setting it if always on or always off - $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); - if ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW || - $export == H5PDisplayOptionBehaviour::NEVER_SHOW) { - $sources['download'] = ($export == H5PDisplayOptionBehaviour::ALWAYS_SHOW); + $download = $this->h5pF->getOption(self::DISPLAY_OPTION_DOWNLOAD, H5PDisplayOptionBehaviour::ALWAYS_SHOW); + if ($download == H5PDisplayOptionBehaviour::ALWAYS_SHOW || + $download == H5PDisplayOptionBehaviour::NEVER_SHOW) { + $sources[self::DISPLAY_OPTION_DOWNLOAD] = ($download == H5PDisplayOptionBehaviour::ALWAYS_SHOW); } // Embed - force setting it if always on or always off - $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + $embed = $this->h5pF->getOption(self::DISPLAY_OPTION_EMBED, H5PDisplayOptionBehaviour::ALWAYS_SHOW); if ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW || $embed == H5PDisplayOptionBehaviour::NEVER_SHOW) { - $sources['embed'] = ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW); + $sources[self::DISPLAY_OPTION_EMBED] = ($embed == H5PDisplayOptionBehaviour::ALWAYS_SHOW); } foreach (H5PCore::$disable as $bit => $option) { @@ -2508,34 +2514,37 @@ class H5PCore { $current_display_options = $disable === NULL ? [] : $this->getDisplayOptionsAsArray($disable); - if ($this->h5pF->getOption('frame', TRUE)) { - $display_options['frame'] = isset($current_display_options['showFrame']) ? $current_display_options['showFrame'] : TRUE; + if ($this->h5pF->getOption(self::DISPLAY_OPTION_FRAME, TRUE)) { + $display_options[self::DISPLAY_OPTION_FRAME] = + isset($current_display_options[self::DISPLAY_OPTION_FRAME]) ? + $current_display_options[self::DISPLAY_OPTION_FRAME] : + TRUE; // Download - $export = $this->h5pF->getOption('export', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + $export = $this->h5pF->getOption(self::DISPLAY_OPTION_DOWNLOAD, H5PDisplayOptionBehaviour::ALWAYS_SHOW); if ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { - $display_options['download'] = - isset($current_display_options['showDownload']) ? - $current_display_options['showDownload'] : + $display_options[self::DISPLAY_OPTION_DOWNLOAD] = + isset($current_display_options[self::DISPLAY_OPTION_DOWNLOAD]) ? + $current_display_options[self::DISPLAY_OPTION_DOWNLOAD] : ($export == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); } // Embed - $embed = $this->h5pF->getOption('embed', H5PDisplayOptionBehaviour::ALWAYS_SHOW); + $embed = $this->h5pF->getOption(self::DISPLAY_OPTION_EMBED, H5PDisplayOptionBehaviour::ALWAYS_SHOW); if ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON || $embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_OFF) { - $display_options['embed'] = - isset($current_display_options['showEmbed']) ? - $current_display_options['showEmbed'] : + $display_options[self::DISPLAY_OPTION_EMBED] = + isset($current_display_options[self::DISPLAY_OPTION_EMBED]) ? + $current_display_options[self::DISPLAY_OPTION_EMBED] : ($embed == H5PDisplayOptionBehaviour::CONTROLLED_BY_AUTHOR_DEFAULT_ON); } // Copyright - if ($this->h5pF->getOption('copyright', TRUE)) { - $display_options['copyright'] = - isset($current_display_options['showCopyright']) ? - $current_display_options['showCopyright'] : + if ($this->h5pF->getOption(self::DISPLAY_OPTION_COPYRIGHT, TRUE)) { + $display_options[self::DISPLAY_OPTION_COPYRIGHT] = + isset($current_display_options[self::DISPLAY_OPTION_COPYRIGHT]) ? + $current_display_options[self::DISPLAY_OPTION_COPYRIGHT] : TRUE; } } @@ -2577,15 +2586,15 @@ class H5PCore { public function getDisplayOptionsForView($disable, $id) { $display_options = $this->getDisplayOptionsAsArray($disable); - if ($this->h5pF->getOption('frame', TRUE) == FALSE) { - $display_options['showFrame'] = false; + if ($this->h5pF->getOption(self::DISPLAY_OPTION_FRAME, TRUE) == FALSE) { + $display_options[self::DISPLAY_OPTION_FRAME] = false; } else { - $this->setDisplayOptionOverrides('export', H5PPermission::DOWNLOAD_H5P, $id, $display_options['showDownload']); - $this->setDisplayOptionOverrides('embed', H5PPermission::EMBED_H5P, $id, $display_options['showEmbed']); + $this->setDisplayOptionOverrides(self::DISPLAY_OPTION_DOWNLOAD, H5PPermission::DOWNLOAD_H5P, $id, $display_options[self::DISPLAY_OPTION_DOWNLOAD]); + $this->setDisplayOptionOverrides(self::DISPLAY_OPTION_EMBED, H5PPermission::EMBED_H5P, $id, $display_options[self::DISPLAY_OPTION_EMBED]); - if ($this->h5pF->getOption('copyright', TRUE) == FALSE) { - $display_options['showCopyright'] = false; + if ($this->h5pF->getOption(self::DISPLAY_OPTION_COPYRIGHT, TRUE) == FALSE) { + $display_options[self::DISPLAY_OPTION_COPYRIGHT] = false; } } @@ -2600,11 +2609,11 @@ class H5PCore { */ private function getDisplayOptionsAsArray($disable) { return array( - 'showFrame' => !($disable & H5PCore::DISABLE_FRAME), - 'showDownload' => !($disable & H5PCore::DISABLE_DOWNLOAD), - 'showEmbed' => !($disable & H5PCore::DISABLE_EMBED), - 'showCopyright' => !($disable & H5PCore::DISABLE_COPYRIGHT), - 'showAbout' => $this->h5pF->getOption('icon', TRUE), + self::DISPLAY_OPTION_FRAME => !($disable & H5PCore::DISABLE_FRAME), + self::DISPLAY_OPTION_DOWNLOAD => !($disable & H5PCore::DISABLE_DOWNLOAD), + self::DISPLAY_OPTION_EMBED => !($disable & H5PCore::DISABLE_EMBED), + self::DISPLAY_OPTION_COPYRIGHT => !($disable & H5PCore::DISABLE_COPYRIGHT), + self::DISPLAY_OPTION_ABOUT => $this->h5pF->getOption(self::DISPLAY_OPTION_ABOUT, TRUE), ); } diff --git a/js/h5p-action-bar.js b/js/h5p-action-bar.js index aba17e3..8e34eb7 100644 --- a/js/h5p-action-bar.js +++ b/js/h5p-action-bar.js @@ -44,17 +44,17 @@ H5P.ActionBar = (function ($, EventDispatcher) { }; // Register action bar buttons - if (displayOptions.showDownload) { + if (displayOptions.export) { // Add export button addActionButton('download', 'export'); } - if (displayOptions.showCopyright) { + if (displayOptions.copyright) { addActionButton('copyrights'); } - if (displayOptions.showEmbed) { + if (displayOptions.embed) { addActionButton('embed'); } - if (displayOptions.showAbout) { + if (displayOptions.icon) { // Add about H5P button icon H5P.jQuery('
          • ').appendTo($actions); hasActions = true; diff --git a/js/h5p.js b/js/h5p.js index 4af85e9..a080ebf 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -133,12 +133,12 @@ H5P.init = function (target) { * Create action bar */ var displayOptions = contentData.displayOptions; - if (displayOptions.showFrame) { + if (displayOptions.frame) { // Special handling of copyrights - if (displayOptions.showCopyright) { + if (displayOptions.copyright) { var copyrights = H5P.getCopyrights(instance, library.params, contentId); if (!copyrights) { - displayOptions.showCopyright = false; + displayOptions.copyright = false; } } @@ -163,7 +163,7 @@ H5P.init = function (target) { $actions.insertAfter($container); } - if (displayOptions.showFrame && actionBar.hasActions()) { + if (displayOptions.frame && actionBar.hasActions()) { $element.addClass('h5p-frame'); } else { From f6449a6043941456eb00b4c08ab802715764f414 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 20 Dec 2016 13:08:49 +0100 Subject: [PATCH 36/41] Improving confirmation dialog [HFP-375] --- styles/h5p-confirmation-dialog.css | 13 +++++++------ styles/h5p-core-button.css | 8 +++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/styles/h5p-confirmation-dialog.css b/styles/h5p-confirmation-dialog.css index 2923b17..7e5196f 100644 --- a/styles/h5p-confirmation-dialog.css +++ b/styles/h5p-confirmation-dialog.css @@ -5,7 +5,7 @@ left: 0; top: 0; - background: rgba(255, 255, 255, 0.85); + background: rgba(28, 34, 41, 0.9); opacity: 1; visibility: visible; -webkit-transition: opacity 0.1s, linear 0s, visibility 0s linear 0s; @@ -46,7 +46,7 @@ transform: translate(-50%, 0%); color: #555; - box-shadow: 0 0 6px 1px #ddd; + box-shadow: 0 0 6px 3px #424242; -webkit-transition: transform 0.1s ease-in; transition: transform 0.1s ease-in; @@ -61,7 +61,7 @@ .h5p-confirmation-dialog-header { padding: 1.5em; background: #fff; - color: #1a73d9; + color: #356593; } .h5p-confirmation-dialog-header-text { @@ -69,8 +69,9 @@ } .h5p-confirmation-dialog-body { + background: #fafbfc; + border-top: solid 1px #dde0e9; padding: 1.25em 1.5em; - background: #fafafa; } .h5p-confirmation-dialog-text { @@ -90,14 +91,14 @@ button.h5p-confirmation-dialog-exit { font-size: 2.5em; top: -0.9em; right: -1.15em; - color: #777; + color: #fff; cursor: pointer; text-decoration: none; } button.h5p-confirmation-dialog-exit:focus, button.h5p-confirmation-dialog-exit:hover { - color: #555; + color: #E4ECF5; } .h5p-confirmation-dialog-exit:before { diff --git a/styles/h5p-core-button.css b/styles/h5p-core-button.css index 3ba392e..eb4e08d 100644 --- a/styles/h5p-core-button.css +++ b/styles/h5p-core-button.css @@ -1,13 +1,15 @@ button.h5p-core-button:visited, button.h5p-core-button:link, button.h5p-core-button { + font-family: "Open Sans", sans-serif; + font-weight: 600; font-size: 1em; line-height: 1.2; padding: 0.5em 1.25em; border-radius: 2em; - background: #1a73d9; - color: #ffffff; + background: #488ac9; + color: #fff; cursor: pointer; border: none; @@ -22,7 +24,7 @@ button.h5p-core-button { } button.h5p-core-button:hover, button.h5p-core-button:focus { - background: #1356a3; + background: #3b71a5; color: #fff; text-decoration: none; -webkit-transition: initial; From 1341768c90ae243e1dfef8cba31d9ee04656abc1 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 20 Dec 2016 14:37:31 +0100 Subject: [PATCH 37/41] Fixed problem with empty actionbar [HFP-277] --- js/h5p.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index a080ebf..aa313b1 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -133,6 +133,7 @@ H5P.init = function (target) { * Create action bar */ var displayOptions = contentData.displayOptions; + var displayFrame = false; if (displayOptions.frame) { // Special handling of copyrights if (displayOptions.copyright) { @@ -160,15 +161,13 @@ H5P.init = function (target) { }); }); - $actions.insertAfter($container); + if (actionBar.hasActions()) { + displayFrame = true; + $actions.insertAfter($container); + } } - if (displayOptions.frame && actionBar.hasActions()) { - $element.addClass('h5p-frame'); - } - else { - $element.addClass('h5p-no-frame'); - } + $element.addClass(displayFrame ? 'h5p-frame' : 'h5p-no-frame'); // Keep track of when we started H5P.opened[contentId] = new Date(); From b91be29cec8500fd1221faae651b0d4930d92ad9 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Tue, 20 Dec 2016 15:46:36 +0100 Subject: [PATCH 38/41] Add return statement to recursive function HFP-391 --- js/h5p.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/h5p.js b/js/h5p.js index 7e5c068..f493f06 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1063,6 +1063,7 @@ H5P.findCopyrights = function (info, parameters, contentId) { } } else { + return; } } }; From 8dd766ecb8654b5a52b22233877034f3bfd3e830 Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 20 Dec 2016 16:39:51 +0100 Subject: [PATCH 39/41] More contrast between confirmation dialog and background [HFP-375] --- styles/h5p-confirmation-dialog.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/h5p-confirmation-dialog.css b/styles/h5p-confirmation-dialog.css index 7e5196f..c7c8558 100644 --- a/styles/h5p-confirmation-dialog.css +++ b/styles/h5p-confirmation-dialog.css @@ -46,7 +46,7 @@ transform: translate(-50%, 0%); color: #555; - box-shadow: 0 0 6px 3px #424242; + box-shadow: 0 0 6px 6px rgba(10,10,10,0.3) -webkit-transition: transform 0.1s ease-in; transition: transform 0.1s ease-in; From 8f681a21403a4fad53336350f6fc3a42f0f936fd Mon Sep 17 00:00:00 2001 From: Paal Joergensen Date: Tue, 20 Dec 2016 16:40:45 +0100 Subject: [PATCH 40/41] Fixing missing semicolon [HFP-375] --- styles/h5p-confirmation-dialog.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/h5p-confirmation-dialog.css b/styles/h5p-confirmation-dialog.css index c7c8558..4fd45c0 100644 --- a/styles/h5p-confirmation-dialog.css +++ b/styles/h5p-confirmation-dialog.css @@ -46,7 +46,7 @@ transform: translate(-50%, 0%); color: #555; - box-shadow: 0 0 6px 6px rgba(10,10,10,0.3) + box-shadow: 0 0 6px 6px rgba(10,10,10,0.3); -webkit-transition: transform 0.1s ease-in; transition: transform 0.1s ease-in; From e2634070d4bd373b56721ad3a27e4677df2ba4d3 Mon Sep 17 00:00:00 2001 From: thomasmars Date: Wed, 21 Dec 2016 11:34:51 +0100 Subject: [PATCH 41/41] Ignore overrideSettings parameter fields. HFP-391 --- js/h5p.js | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/js/h5p.js b/js/h5p.js index f493f06..b00afea 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -97,7 +97,7 @@ H5P.init = function (target) { // element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe } - // Deprecated variable, kept to maintain backwards compatability + // Deprecated variable, kept to maintain backwards compatability if (H5P.canHasFullScreen === undefined) { /** * @deprecated since version 1.11 @@ -1037,6 +1037,28 @@ H5P.findCopyrights = function (info, parameters, contentId) { if (!parameters.hasOwnProperty(field)) { continue; // Do not check } + + /* + * TODO: Make parameters clean again + * Some content types adds jQuery or other objects to parameters + * in order to determine override settings for sub-content-types. + * For instance Question Set tells Multiple Choice that it should + * attach Multi Choice's confirmation dialog to a Question Set + * jQuery element, so that the confirmation dialog will not be restricted + * to the space confined by Multi Choice. + * Ideally this should not be added to parameters, we must make a better + * solution. We should likely be adding these to sub-content through + * functions/setters instead of passing them down as params. + * + * This solution is implemented as a hack that will ignore all parameters + * inside a "overrideSettings" field, this should suffice for now since + * all overridden objects are added to this field, however this is not very + * robust solution and will very likely lead to problems in the future. + */ + if (field === 'overrideSettings') { + continue; + } + var value = parameters[field]; if (value instanceof Array) { @@ -1062,9 +1084,6 @@ H5P.findCopyrights = function (info, parameters, contentId) { info.addMedia(copyrights); } } - else { - return; - } } };