1){var u=arguments[1],r=(arguments.length==3)?arguments[2]:{};if(typeof u=="string"){u={src:u}}u=j({bgcolor:"#000000",version:[10,1],expressInstall:"http://releases.flowplayer.org/swf/expressinstall.swf",cachebusting:false},u);if(typeof p=="string"){if(p.indexOf(".")!=-1){var t=[];n(o(p),function(){t.push(new b(this,l(u),l(r)))});return new d(t)}else{var s=c(p);return new b(s!==null?s:l(p),l(u),l(r))}}else{if(p){return new b(p,l(u),l(r))}}}return null};j(window.$f,{fireEvent:function(){var q=[].slice.call(arguments);var r=$f(q[0]);return r?r._fireEvent(q.slice(1)):null},addPlugin:function(p,q){b.prototype[p]=q;return $f},each:n,extend:j});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(r,q){if(!arguments.length||typeof arguments[0]=="number"){var p=[];this.each(function(){var s=$f(this);if(s){p.push(s)}});return arguments.length?p[arguments[0]]:new d(p)}return this.each(function(){$f(this,l(r),q?l(q):{})})}}}();!function(){var h=document.all,j="http://get.adobe.com/flashplayer",c=typeof jQuery=="function",e=/(\d+)[^\d]+(\d+)[^\d]*(\d*)/,b={width:"100%",height:"100%",id:"_"+(""+Math.random()).slice(9),allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:[3,0],onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function i(m,l){if(l){for(var f in l){if(l.hasOwnProperty(f)){m[f]=l[f]}}}return m}function a(f,n){var m=[];for(var l in f){if(f.hasOwnProperty(l)){m[l]=n(f[l])}}return m}window.flashembed=function(f,m,l){if(typeof f=="string"){f=document.getElementById(f.replace("#",""))}if(!f){return}if(typeof m=="string"){m={src:m}}return new d(f,i(i({},b),m),l)};var g=i(window.flashembed,{conf:b,getVersion:function(){var m,f;try{f=navigator.plugins["Shockwave Flash"].description.slice(16)}catch(o){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");f=m&&m.GetVariable("$version")}catch(n){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");f=m&&m.GetVariable("$version")}catch(l){}}}f=e.exec(f);return f?[1*f[1],1*f[(f[1]*1>9?2:3)]*1]:[0,0]},asString:function(l){if(l===null||l===undefined){return null}var f=typeof l;if(f=="object"&&l.push){f="array"}switch(f){case"string":l=l.replace(new RegExp('(["\\\\])',"g"),"\\$1");l=l.replace(/^\s?(\d+\.?\d*)%/,"$1pct");return'"'+l+'"';case"array":return"["+a(l,function(o){return g.asString(o)}).join(",")+"]";case"function":return'"function()"';case"object":var m=[];for(var n in l){if(l.hasOwnProperty(n)){m.push('"'+n+'":'+g.asString(l[n]))}}return"{"+m.join(",")+"}"}return String(l).replace(/\s/g," ").replace(/\'/g,'"')},getHTML:function(o,l){o=i({},o);var n=''}o.width=o.height=o.id=o.w3c=o.src=null;o.onFail=o.version=o.expressInstall=null;for(var m in o){if(o[m]){n+=''}}var p="";if(l){for(var f in l){if(l[f]){var q=l[f];p+=f+"="+(/function|object/.test(typeof q)?g.asString(q):q)+"&"}}p=p.slice(0,-1);n+='"}n+="";return n},isSupported:function(f){return k[0]>f[0]||k[0]==f[0]&&k[1]>=f[1]}});var k=g.getVersion();function d(f,n,m){if(g.isSupported(n.version)){f.innerHTML=g.getHTML(n,m)}else{if(n.expressInstall&&g.isSupported([6,65])){f.innerHTML=g.getHTML(i(n,{src:n.expressInstall}),{MMredirectURL:encodeURIComponent(location.href),MMplayerType:"PlugIn",MMdoctitle:document.title})}else{if(!f.innerHTML.replace(/\s/g,"")){f.innerHTML="Flash version "+n.version+" or greater is required
"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"
"+(f.tagName=="A"?"Click here to download latest version
":"Download latest version from here
");if(f.tagName=="A"||f.tagName=="DIV"){f.onclick=function(){location.href=j}}}if(n.onFail){var l=n.onFail.call(this);if(typeof l=="string"){f.innerHTML=l}}}}if(h){window[n.id]=document.getElementById(n.id)}i(this,{getRoot:function(){return f},getOptions:function(){return n},getConf:function(){return m},getApi:function(){return f.firstChild}})}if(c){jQuery.tools=jQuery.tools||{version:"3.2.12"};jQuery.tools.flashembed={conf:b};jQuery.fn.flashembed=function(l,f){return this.each(function(){$(this).data("flashembed",flashembed(this,l,f))})}}}();
\ No newline at end of file
diff --git a/js/h5p-content-upgrade.js b/js/h5p-content-upgrade.js
new file mode 100644
index 0000000..5542bdd
--- /dev/null
+++ b/js/h5p-content-upgrade.js
@@ -0,0 +1,474 @@
+var H5PUpgrades = H5PUpgrades || {};
+
+(function ($) {
+ var info, $container;
+
+ // Initialize
+ $(document).ready(function () {
+ // Get library info
+ info = H5PIntegration.getLibraryInfo();
+
+ // Get and reset container
+ $container = $('#h5p-admin-container').html('' + info.message + '
');
+
+ // Make it possible to select version
+ var $version = $(getVersionSelect(info.versions)).appendTo($container);
+
+ // Add "go" button
+ $('', {
+ class: 'h5p-admin-upgrade-button',
+ text: info.buttonLabel,
+ click: function () {
+ // Start new content upgrade
+ new ContentUpgrade($version.val());
+ }
+ }).appendTo($container);
+ });
+
+ /**
+ * Generate html for version select.
+ *
+ * @param {Object} versions
+ * @returns {String}
+ */
+ var getVersionSelect = function (versions) {
+ var html = '';
+ for (var id in versions) {
+ html += '';
+ }
+ if (html !== '') {
+ html = '';
+ return html;
+ }
+ };
+
+ /**
+ * Private. Helps process each property on the given object asynchronously in serial order.
+ *
+ * @param {Object} obj
+ * @param {Function} process
+ * @param {Function} finished
+ */
+ var asyncSerial = function (obj, process, finished) {
+ var id, isArray = obj instanceof Array;
+
+ // Keep track of each property that belongs to this object.
+ if (!isArray) {
+ var ids = [];
+ for (id in obj) {
+ if (obj.hasOwnProperty(id)) {
+ ids.push(id);
+ }
+ }
+ }
+
+ var i = -1; // Keeps track of the current property
+
+ /**
+ * Private. Process the next property
+ */
+ var next = function () {
+ id = isArray ? i : ids[i];
+ process(id, obj[id], check);
+ };
+
+ /**
+ * Private. Check if we're done or have an error.
+ *
+ * @param {String} err
+ */
+ var check = function (err) {
+ i++;
+ if (i === (isArray ? obj.length : ids.length) || (err !== undefined && err !== null)) {
+ finished(err);
+ }
+ else {
+ next();
+ }
+ };
+
+ check(); // Start
+ };
+
+ /**
+ * Make it easy to keep track of version details.
+ *
+ * @param {String} version
+ * @param {Number} libraryId
+ * @returns {_L1.Version}
+ */
+ function Version(version, libraryId) {
+ if (libraryId !== undefined) {
+ version = info.versions[libraryId];
+
+ // Public
+ this.libraryId = libraryId;
+ }
+ var versionSplit = version.split('.', 3);
+
+ // Public
+ this.major = versionSplit[0];
+ this.minor = versionSplit[1];
+
+ /**
+ * Public. Custom string for this object.
+ *
+ * @returns {String}
+ */
+ this.toString = function () {
+ return version;
+ };
+ }
+
+ /**
+ * Displays a throbber in the status field.
+ *
+ * @param {String} msg
+ * @returns {_L1.Throbber}
+ */
+ function Throbber(msg) {
+ var $throbber = H5PUtils.throbber(msg);
+ $container.html('').append($throbber);
+
+ /**
+ * Makes it possible to set the progress.
+ *
+ * @param {String} progress
+ */
+ this.setProgress = function (progress) {
+ $throbber.text(msg + ' ' + progress);
+ };
+ }
+
+ /**
+ * Start a new content upgrade.
+ *
+ * @param {Number} libraryId
+ * @returns {_L1.ContentUpgrade}
+ */
+ function ContentUpgrade(libraryId) {
+ var self = this;
+
+ // Get selected version
+ self.version = new Version(null, libraryId);
+
+ // Create throbber with loading text and progress
+ self.throbber = new Throbber(info.inProgress.replace('%ver', self.version));
+
+ // Get the next batch
+ self.nextBatch({
+ libraryId: libraryId,
+ token: info.token
+ });
+ }
+
+ /**
+ * Get the next batch and start processing it.
+ *
+ * @param {Object} outData
+ */
+ ContentUpgrade.prototype.nextBatch = function (outData) {
+ var self = this;
+
+ $.post(info.infoUrl, outData, function (inData) {
+ if (!(inData instanceof Object)) {
+ // Print errors from backend
+ return self.setStatus(inData);
+ }
+ if (inData.left === 0) {
+ // Nothing left to process
+ return self.setStatus(info.done);
+ }
+
+ self.left = inData.left;
+ self.token = inData.token;
+
+ // Start processing
+ self.processBatch(inData.params);
+ });
+ };
+
+ /**
+ * Set current status message.
+ *
+ * @param {String} msg
+ */
+ ContentUpgrade.prototype.setStatus = function (msg) {
+ $container.html(msg);
+ };
+
+ /**
+ * Process the given parameters.
+ *
+ * @param {Object} parameters
+ */
+ ContentUpgrade.prototype.processBatch = function (parameters) {
+ var self = this;
+ var upgraded = {}; // Track upgraded params
+
+ var current = 0; // Track progress
+ asyncSerial(parameters, function (id, params, next) {
+
+ // Make params possible to work with
+ params = JSON.parse(params);
+
+ // Upgrade this content.
+ self.upgrade(info.library.name, new Version(info.library.version), self.version, params, function (err, params) {
+ if (!err) {
+ upgraded[id] = JSON.stringify(params);
+
+ current++;
+ self.throbber.setProgress(Math.round((info.total - self.left + current) / (info.total / 100)) + ' %');
+ }
+ next(err);
+ });
+
+ }, function (err) {
+ // Finished with all parameters that came in
+ if (err) {
+ return self.setStatus('' + info.error + '
' + err + '
');
+ }
+
+ // Save upgraded content and get next round of data to process
+ self.nextBatch({
+ libraryId: self.version.libraryId,
+ token: self.token,
+ params: JSON.stringify(upgraded)
+ });
+ });
+ };
+
+ /**
+ * Upgade the given content.
+ *
+ * @param {String} name
+ * @param {Version} oldVersion
+ * @param {Version} newVersion
+ * @param {Object} params
+ * @param {Function} next
+ * @returns {undefined}
+ */
+ ContentUpgrade.prototype.upgrade = function (name, oldVersion, newVersion, params, next) {
+ var self = this;
+
+ // Load library details and upgrade routines
+ self.loadLibrary(name, newVersion, function (err, library) {
+ if (err) {
+ return next(err);
+ }
+
+ // Run upgrade routines on params
+ self.processParams(library, oldVersion, newVersion, params, function (err, params) {
+ if (err) {
+ return next(err);
+ }
+
+ // Check if any of the sub-libraries need upgrading
+ asyncSerial(library.semantics, function (index, field, next) {
+ self.processField(field, params[field.name], function (err, upgradedParams) {
+ if (upgradedParams) {
+ params[field.name] = upgradedParams;
+ }
+ next(err);
+ });
+ }, function (err) {
+ next(err, params);
+ });
+ });
+ });
+ };
+
+ /**
+ * Load library data needed for content upgrade.
+ *
+ * @param {String} name
+ * @param {Version} version
+ * @param {Function} next
+ */
+ ContentUpgrade.prototype.loadLibrary = function (name, version, next) {
+ var self = this;
+
+ $.ajax({
+ dataType: 'json',
+ url: info.libraryBaseUrl + '/' + name + '/' + version.major + '/' + version.minor
+ }).fail(function () {
+ next(info.errorData.replace('%lib', name + ' ' + version));
+ }).done(function (library) {
+ if (library.upgradesScript) {
+ self.loadScript(library.upgradesScript, function (err) {
+ if (err) {
+ err = info.errorScript.replace('%lib', name + ' ' + version);
+ }
+ next(err, library);
+ });
+ }
+ else {
+ next(null, library);
+ }
+ });
+ };
+
+ /**
+ * Load script with upgrade hooks.
+ *
+ * @param {String} url
+ * @param {Function} next
+ */
+ ContentUpgrade.prototype.loadScript = function (url, next) {
+ $.ajax({
+ dataType: 'script',
+ cache: true,
+ url: url
+ }).fail(function () {
+ next(true);
+ }).done(function () {
+ next();
+ });
+ };
+
+ /**
+ * Run upgrade hooks on params.
+ *
+ * @param {Object} library
+ * @param {Version} oldVersion
+ * @param {Version} newVersion
+ * @param {Object} params
+ * @param {Function} next
+ */
+ ContentUpgrade.prototype.processParams = function (library, oldVersion, newVersion, params, next) {
+ if (H5PUpgrades[library.name] === undefined) {
+ if (library.upgradesScript) {
+ // Upgrades script should be loaded so the upgrades should be here.
+ return next(info.errorScript.replace('%lib', library.name + ' ' + newVersion));
+ }
+
+ // No upgrades script. Move on
+ return next(null, params);
+ }
+
+ // Run upgrade hooks. Start by going through major versions
+ asyncSerial(H5PUpgrades[library.name], function (major, minors, nextMajor) {
+ if (major < oldVersion.major || major > newVersion.major) {
+ // Older than the current version or newer than the selected
+ nextMajor();
+ }
+ else {
+ // Go through the minor versions for this major version
+ asyncSerial(minors, function (minor, upgrade, nextMinor) {
+ if (minor <= oldVersion.minor || minor > newVersion.minor) {
+ // Older than or equal to the current version or newer than the selected
+ nextMinor();
+ }
+ else {
+ // We found an upgrade hook, run it
+ if (upgrade.contentUpgrade !== undefined && typeof upgrade.contentUpgrade === 'function') {
+ upgrade.contentUpgrade(params, function (err, upgradedParams) {
+ params = upgradedParams;
+ nextMinor(err);
+ });
+ }
+ else {
+ nextMinor(info.errorScript.replace('%lib', library.name + ' ' + newVersion));
+ }
+ }
+ }, nextMajor);
+ }
+ }, function (err) {
+ next(err, params);
+ });
+ };
+
+ /**
+ * Process parameter fields to find and upgrade sub-libraries.
+ *
+ * @param {Object} field
+ * @param {Object} params
+ * @param {Function} next
+ */
+ ContentUpgrade.prototype.processField = function (field, params, next) {
+ var self = this;
+
+ if (params === undefined) {
+ return next();
+ }
+
+ switch (field.type) {
+ case 'library':
+ if (params.library === undefined || params.params === undefined) {
+ return next();
+ }
+
+ // Look for available upgrades
+ var usedLib = params.library.split(' ', 2);
+ for (var i = 0; i < field.options.length; i++) {
+ var availableLib = field.options[i].split(' ', 2);
+ if (availableLib[0] === usedLib[0]) {
+ if (availableLib[1] === usedLib[1]) {
+ return next(); // Same version
+ }
+
+ // We have different versions
+ var usedVer = new Version(usedLib[1]);
+ var availableVer = new Version(availableLib[1]);
+ if (usedVer.major > availableVer.major || (usedVer.major === availableVer.major && usedVer.minor >= availableVer.minor)) {
+ return next(); // Larger or same version that's available
+ }
+
+ // A newer version is available, upgrade params
+ return self.upgrade(availableLib[0], usedVer, availableVer, params.params, function (err, upgraded) {
+ if (!err) {
+ params.library = availableLib[0] + ' ' + availableVer.major + '.' + availableVer.minor;
+ params.params = upgraded;
+ }
+ next(err, params);
+ });
+ }
+ }
+ next();
+ break;
+
+ case 'group':
+ if (field.fields.length === 1) {
+ // Single field to process, wrapper will be skipped
+ self.processField(field.fields[0], params, function (err, upgradedParams) {
+ if (upgradedParams) {
+ params = upgradedParams;
+ }
+ next(err, params);
+ });
+ }
+ else {
+ // Go through all fields in the group
+ asyncSerial(field.fields, function (index, subField, next) {
+ self.processField(subField, params[subField.name], function (err, upgradedParams) {
+ if (upgradedParams) {
+ params[subField.name] = upgradedParams;
+ }
+ next(err);
+ });
+ }, function (err) {
+ next(err, params);
+ });
+ }
+ break;
+
+ case 'list':
+ // Go trough all params in the list
+ asyncSerial(params, function (index, subParams, next) {
+ self.processField(field.field, subParams, function (err, upgradedParams) {
+ if (upgradedParams) {
+ params[index] = upgradedParams;
+ }
+ next(err);
+ });
+ }, function (err) {
+ next(err, params);
+ });
+ break;
+
+ default:
+ next();
+ }
+ };
+
+})(H5P.jQuery);
\ No newline at end of file
diff --git a/js/h5p-embed.js b/js/h5p-embed.js
index b94fd29..ae8efc2 100644
--- a/js/h5p-embed.js
+++ b/js/h5p-embed.js
@@ -15,7 +15,7 @@ var H5P = H5P || (function () {
result += prefix + content[i] + suffix;
}
return result;
- }
+ };
/**
*
@@ -25,7 +25,7 @@ var H5P = H5P || (function () {
var data, callback = 'H5P' + id;
// Prevent duplicate loading.
- script.removeAttribute('data-h5p')
+ script.removeAttribute('data-h5p');
// Callback for when content data is loaded.
window[callback] = function (content) {
@@ -64,13 +64,13 @@ var H5P = H5P || (function () {
parent.removeChild(script);
head.removeChild(data);
delete window[callback];
- }
+ };
// Create data script
data = document.createElement('script');
data.src = url + (url.indexOf('?') === -1 ? '?' : '&') + 'callback=' + callback;
head.appendChild(data);
- }
+ };
/**
* Go throught all script tags with the data-h5p attribute and load content.
@@ -113,7 +113,7 @@ var H5P = H5P || (function () {
library: content.library,
jsonContent: content.params,
fullScreen: content.fullscreen,
- export: content.export,
+ exportUrl: content.exportUrl,
embedCode: content.embedCode
};
},
@@ -126,15 +126,20 @@ var H5P = H5P || (function () {
};
// Detect if we support fullscreen, and what prefix to use.
- var fullScreenBrowserPrefix;
+ var fullScreenBrowserPrefix, safariBrowser;
if (document.documentElement.requestFullScreen) {
fullScreenBrowserPrefix = '';
}
else if (document.documentElement.webkitRequestFullScreen
&& navigator.userAgent.indexOf('Android') === -1 // Skip Android
- && navigator.userAgent.indexOf('Version/') === -1 // Skip Safari
) {
- fullScreenBrowserPrefix = 'webkit';
+ safariBrowser = navigator.userAgent.match(/Version\/(\d)/);
+ safariBrowser = (safariBrowser === null ? 0 : parseInt(safariBrowser[1]));
+
+ // Do not allow fullscreen for safari < 7.
+ if (safariBrowser === 0 || safariBrowser > 6) {
+ fullScreenBrowserPrefix = 'webkit';
+ }
}
else if (document.documentElement.mozRequestFullScreen) {
fullScreenBrowserPrefix = 'moz';
@@ -151,32 +156,55 @@ var H5P = H5P || (function () {
var $classes = $element.add(body);
var $body = $classes.eq(1);
- var done = function (c) {
- H5P.isFullscreen = false;
- $classes.removeClass(c);
-
- if (H5P.fullScreenBrowserPrefix === undefined) {
- // Resize content.
- if (instance.$ !== undefined) {
- instance.$.trigger('resize');
- }
- }
+ /**
+ * Prepare for resize by setting the correct styles.
+ *
+ * @param {String} classes CSS
+ */
+ var before = function (classes) {
+ $classes.addClass(classes);
+ iframe.style.height = '100%';
+ };
- if (exitCallback !== undefined) {
- exitCallback();
- }
- };
+ /**
+ * Gets called when fullscreen mode has been entered.
+ * Resizes and sets focus on content.
+ */
+ var entered = function () {
+ // Do not rely on window resize events.
+ instance.$.trigger('resize');
+ instance.$.trigger('focus');
+ };
+
+ /**
+ * Gets called when fullscreen mode has been exited.
+ * Resizes and sets focus on content.
+ *
+ * @param {String} classes CSS
+ */
+ var done = function (classes) {
+ H5P.isFullscreen = false;
+ $classes.removeClass(classes);
+
+ // Do not rely on window resize events.
+ instance.$.trigger('resize');
+ instance.$.trigger('focus');
+
+ if (exitCallback !== undefined) {
+ exitCallback();
+ }
+ };
H5P.isFullscreen = true;
if (fullScreenBrowserPrefix === undefined) {
// Create semi fullscreen.
-
- $classes.addClass('h5p-semi-fullscreen');
- iframe.style.position = 'fixed';
+ before('h5p-semi-fullscreen');
+ iframe.style.position = 'fixed';
+
var $disable = $element.prepend('').children(':first');
var keyup, disableSemiFullscreen = function () {
- $disable.remove();
+ $disable.remove();
$body.unbind('keyup', keyup);
iframe.style.position = 'static';
done('h5p-semi-fullscreen');
@@ -189,17 +217,22 @@ var H5P = H5P || (function () {
};
$disable.click(disableSemiFullscreen);
$body.keyup(keyup); // TODO: Does not work with iframe's $!
-
+ entered();
}
else {
// Create real fullscreen.
-
+
+ before('h5p-fullscreen');
var first, eventName = (fullScreenBrowserPrefix === 'ms' ? 'MSFullscreenChange' : fullScreenBrowserPrefix + 'fullscreenchange');
document.addEventListener(eventName, function () {
if (first === undefined) {
+ // We are entering fullscreen mode
first = false;
+ entered();
return;
}
+
+ // We are exiting fullscreen
done('h5p-fullscreen');
document.removeEventListener(eventName, arguments.callee, false);
});
@@ -209,24 +242,9 @@ var H5P = H5P || (function () {
}
else {
var method = (fullScreenBrowserPrefix === 'ms' ? 'msRequestFullscreen' : fullScreenBrowserPrefix + 'RequestFullScreen');
- var params = (fullScreenBrowserPrefix === 'webkit' ? Element.ALLOW_KEYBOARD_INPUT : undefined);
+ var params = (fullScreenBrowserPrefix === 'webkit' && safariBrowser === 0 ? Element.ALLOW_KEYBOARD_INPUT : undefined);
iframe[method](params);
}
-
- $classes.addClass('h5p-fullscreen');
- }
-
- iframe.style.height = '100%';
- if (H5P.fullScreenBrowserPrefix === undefined) {
- // Resize content.
- if (instance.$ !== undefined) {
- instance.$.trigger('resize', [true]);
- }
- }
-
- // Allow H5P to set focus when entering fullscreen mode
- if (instance.focus !== undefined) {
- instance.focus();
}
};
diff --git a/js/h5p-library-details.js b/js/h5p-library-details.js
index 4341654..e274d22 100644
--- a/js/h5p-library-details.js
+++ b/js/h5p-library-details.js
@@ -39,8 +39,19 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
$libraryInfo.append(H5PUtils.createLabeledField(title, value));
});
+ var count;
+ if (H5PLibraryDetails.library.notCached !== undefined) {
+ count = H5PIntegration.i18n.H5P.NA;
+ }
+ else if (H5PLibraryDetails.library.content === undefined) {
+ count = 0;
+ }
+ else {
+ count = H5PLibraryDetails.library.content.length;
+ }
+
// List counter:
- $libraryInfo.append(H5PUtils.createLabeledField(H5PLibraryDetails.library.translations.contentCount, H5PLibraryDetails.currentContent ? H5PLibraryDetails.currentContent.length : 0));
+ $libraryInfo.append(H5PUtils.createLabeledField(H5PLibraryDetails.library.translations.contentCount, count));
return $libraryInfo;
};
@@ -49,6 +60,10 @@ var H5PLibraryDetails= H5PLibraryDetails || {};
* Create the content list with searching and paging
*/
H5PLibraryDetails.createContentElement = function () {
+ if (H5PLibraryDetails.library.notCached !== undefined) {
+ return H5PUtils.getRebuildCache(H5PLibraryDetails.library.notCached);
+ }
+
if (H5PLibraryDetails.currentContent === undefined) {
H5PLibraryDetails.$content = $('' + H5PLibraryDetails.library.translations.noContent + '
');
}
diff --git a/js/h5p-library-list.js b/js/h5p-library-list.js
index 4ddfc7d..a238d39 100644
--- a/js/h5p-library-list.js
+++ b/js/h5p-library-list.js
@@ -8,6 +8,11 @@ var H5PLibraryList= H5PLibraryList || {};
H5PLibraryList.init = function () {
var $adminContainer = H5PIntegration.getAdminContainer();
+ var libraryList = H5PIntegration.getLibraryList();
+ if (libraryList.notCached) {
+ $adminContainer.append(H5PUtils.getRebuildCache(libraryList.notCached));
+ }
+
// Create library list
$adminContainer.append(H5PLibraryList.createLibraryList(H5PIntegration.getLibraryList()));
};
@@ -28,25 +33,38 @@ var H5PLibraryList= H5PLibraryList || {};
$table.addClass('libraries');
// Add libraries
+ var t = H5PIntegration.i18n.H5P;
$.each (libraries.listData, function (index, library) {
var $libraryRow = H5PUtils.createTableRow([
- library.name,
- library.machineName,
- library.contentCount,
- library.libraryDependencyCount,
- '' +
- ''
+ library.title,
+ library.numContent,
+ library.numContentDependencies === -1 ? t.NA : library.numContentDependencies,
+ library.numLibraryDependencies,
+ '\
+ \
+ \
+ \
+
'
]);
+ if (library.upgradeUrl !== null && library.numContent !== 0) {
+ $('.h5p-admin-upgrade-library', $libraryRow).attr('title', t.upgradeLibrary).click(function () {
+ window.location.href = library.upgradeUrl;
+ });
+ }
+ else {
+ $('.h5p-admin-upgrade-library', $libraryRow).attr('disabled', true);
+ }
+
// Open details view when clicked
$('.h5p-admin-view-library', $libraryRow).on('click', function () {
window.location.href = library.detailsUrl;
});
var $deleteButton = $('.h5p-admin-delete-library', $libraryRow);
- if (library.contentCount !== 0 || library.libraryDependencyCount !== 0) {
+ if (library.numContent !== 0 || library.numContentDependencies !== 0 || library.numLibraryDependencies !== 0) {
// Disabled delete if content.
- $deleteButton.attr('disabled', true); //.addClass('disabled');
+ $deleteButton.attr('disabled', true).attr('title', t.deleteLibrary);
}
else {
// Go to delete page om click.
diff --git a/js/h5p-utils.js b/js/h5p-utils.js
index dae71e2..d8faf68 100644
--- a/js/h5p-utils.js
+++ b/js/h5p-utils.js
@@ -17,7 +17,7 @@ var H5PUtils = H5PUtils || {};
$tr.append('' + value + ' | ');
});
- $table.append($thead.append($tr))
+ $table.append($thead.append($tr));
}
return $table;
@@ -51,7 +51,7 @@ var H5PUtils = H5PUtils || {};
$field.append('' + value + '
');
return $field;
- }
+ };
/**
* Replaces placeholder fields in translation strings
@@ -61,9 +61,60 @@ var H5PUtils = H5PUtils || {};
*/
H5PUtils.translateReplace = function (template, replacors) {
$.each(replacors, function (key, value) {
- template = template.replace(new RegExp('\\'+key, 'g'), value)
+ template = template.replace(new RegExp('\\'+key, 'g'), value);
});
return template;
- }
+ };
+
+ /**
+ * Get throbber with given text.
+ *
+ * @param {String} text
+ * @returns {$}
+ */
+ H5PUtils.throbber = function (text) {
+ return $('', {
+ class: 'h5p-throbber',
+ text: text
+ });
+ };
+
+ /**
+ * Makes it possbile to rebuild all content caches from admin UI.
+ * @param {Object} notCached
+ * @returns {$}
+ */
+ H5PUtils.getRebuildCache = function (notCached) {
+ var $container = $('' + notCached.message + '