Merge branch 'master' of github.com:h5p/h5p-php-library

namespaces
Frode Petterson 2014-07-18 11:26:54 +02:00
commit ebbd4c8fc1
1 changed files with 4 additions and 2 deletions

View File

@ -1,3 +1,5 @@
var H5PUpgrades = H5PUpgrades || {};
(function ($) { (function ($) {
var info, $container; var info, $container;
@ -77,7 +79,7 @@
*/ */
var check = function (err) { var check = function (err) {
i++; i++;
if (i === (isArray ? obj.length : ids.length) || err !== undefined) { if (i === (isArray ? obj.length : ids.length) || (err !== undefined && err !== null)) {
finished(err); finished(err);
} }
else { else {
@ -168,7 +170,7 @@
ContentUpgrade.prototype.nextBatch = function (outData) { ContentUpgrade.prototype.nextBatch = function (outData) {
var self = this; var self = this;
$.post(info.url, outData, function (inData) { $.post(info.infoUrl, outData, function (inData) {
if (!(inData instanceof Object)) { if (!(inData instanceof Object)) {
// Print errors from backend // Print errors from backend
return self.setStatus(inData); return self.setStatus(inData);