From 53ceb6156b3a8c6df421903352f4fd9223e22167 Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Thu, 25 Sep 2014 14:38:05 +0200 Subject: [PATCH] Improved content check, supporting blank fields. --- js/h5p-library-list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/h5p-library-list.js b/js/h5p-library-list.js index 8327744..a1e517f 100644 --- a/js/h5p-library-list.js +++ b/js/h5p-library-list.js @@ -55,10 +55,11 @@ var H5PLibraryList= H5PLibraryList || {}; ' ]); + var hasContent = !(library.numContent === '' || library.numContent === 0); if (library.upgradeUrl === null) { $('.h5p-admin-upgrade-library', $libraryRow).remove(); } - else if (library.upgradeUrl === false || library.numContent === 0) { + else if (library.upgradeUrl === false || !hasContent) { $('.h5p-admin-upgrade-library', $libraryRow).attr('disabled', true); } else { @@ -73,7 +74,7 @@ var H5PLibraryList= H5PLibraryList || {}; }); var $deleteButton = $('.h5p-admin-delete-library', $libraryRow); - if (libraries.notCached !== undefined || library.numContent !== 0 || (library.numContentDependencies !== '' && library.numContentDependencies !== 0) || (library.numLibraryDependencies !== '' && library.numLibraryDependencies !== 0)) { + if (libraries.notCached !== undefined || hasContent || (library.numContentDependencies !== '' && library.numContentDependencies !== 0) || (library.numLibraryDependencies !== '' && library.numLibraryDependencies !== 0)) { // Disabled delete if content. $deleteButton.attr('disabled', true); }