diff --git a/plugins/attribution/popcorn.attribution.html b/plugins/attribution/popcorn.attribution.html index 28f9c3d2..fd3a1511 100644 --- a/plugins/attribution/popcorn.attribution.html +++ b/plugins/attribution/popcorn.attribution.html @@ -16,7 +16,7 @@ nameofwork: "A Shared Culture", copyrightholder:"Jesse Dylan", license: "CC-BY-N6", - licenseUrl: "http://creativecommons.org/licenses/by-nc/2.0/", + licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/", target: 'attribdiv' } ) .attribution({ @@ -26,7 +26,7 @@ nameofworkurl:"http://www.archive.org/details/CC1232_internet", copyrightholder:"The Computer Chronicles", license:"CC-BY-NC-ND", - licenseUrl: "http://creativecommons.org/licenses/by-nc-nd/2.0/", + licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/", target: 'attribdiv' } ) diff --git a/plugins/attribution/popcorn.attribution.js b/plugins/attribution/popcorn.attribution.js index dd053ca8..dd44fcc3 100644 --- a/plugins/attribution/popcorn.attribution.js +++ b/plugins/attribution/popcorn.attribution.js @@ -50,9 +50,9 @@ nameofwork : {elem:'input', type:'text', label:'Name of Work'}, nameofworkurl : {elem:'input', type:'text', label:'Url of Work'}, copyrightholder : {elem:'input', type:'text', label:'Copyright Holder'}, - copyrightHolderurl : {elem:'input', type:'text', label:'Copyright Holder Url'}, + copyrightholderurl : {elem:'input', type:'text', label:'Copyright Holder Url'}, license : {elem:'input', type:'text', label:'License type'}, - licenseUrl : {elem:'input', type:'text', label:'License URL'}, + licenseurl : {elem:'input', type:'text', label:'License URL'}, target : 'attribution-container' } }, @@ -71,13 +71,13 @@ if (options.nameofworkurl) { attrib += ""; } - if (options.copyrightHolderurl) { - attrib += ""; + if (options.copyrightholderurl) { + attrib += ""; } if (options.copyrightholder) { attrib += ", " + options.copyrightholder; } - if (options.copyrightHolderurl) { + if (options.copyrightholderurl) { attrib += ""; } @@ -88,14 +88,14 @@ if (options.license) { if (licenses[options.license.toLowerCase()]) { - if (options.licenseUrl) { - attrib = " " + attrib; + if (options.licenseurl) { + attrib = " " + attrib; } else { attrib = "" + attrib; } } else { - if (options.licenseUrl) { - attrib += ", license: " + options.license + " "; + if (options.licenseurl) { + attrib += ", license: " + options.license + " "; } else { attrib += ", license: " + options.license; } diff --git a/plugins/attribution/popcorn.attribution.unit.js b/plugins/attribution/popcorn.attribution.unit.js index 542c80b8..31977705 100644 --- a/plugins/attribution/popcorn.attribution.unit.js +++ b/plugins/attribution/popcorn.attribution.unit.js @@ -30,8 +30,8 @@ test("Popcorn attribution Plugin", function () { end: 5, // seconds nameofwork: "A Shared Culture", copyrightholder:"Jesse Dylan", - licenseType: "CC-BY-N6", - licenseUrl: "http://creativecommons.org/licenses/by-nc/2.0/", + license: "CC-BY-N6", + licenseurl: "http://creativecommons.org/licenses/by-nc/2.0/", target: 'attribdiv' } ) .attribution({ @@ -40,8 +40,8 @@ test("Popcorn attribution Plugin", function () { nameofwork: "Internet", nameofworkurl:"http://www.archive.org/details/CC1232_internet", copyrightholder:"The Computer Chronicles", - licenseType:"CC-BY-NC-ND", - licenseUrl: "http://creativecommons.org/licenses/by-nc-nd/2.0/", + license:"CC-BY-NC-ND", + licenseurl: "http://creativecommons.org/licenses/by-nc-nd/2.0/", target: 'attribdiv' } ) .volume(0)