diff --git a/system/application/views/melons/cantaloupe/js/scalarheader.jquery.js b/system/application/views/melons/cantaloupe/js/scalarheader.jquery.js index db727712d..4cfbd75b8 100755 --- a/system/application/views/melons/cantaloupe/js/scalarheader.jquery.js +++ b/system/application/views/melons/cantaloupe/js/scalarheader.jquery.js @@ -1253,13 +1253,16 @@ getPropertyValue:function(a){return this[a]||""},item:function(){},removePropert var slug = this_parent_nodes[n]; if(slug != base.currentNode.slug){ (function(slug,depth){ + // if this is a comment relation, get the provenance data as well so we can + // attribute comments by name + var prov = ( commented_by.indexOf( scalarapi.getNode( slug ) ) != -1 ); scalarapi.loadPage( slug, true, function(){ var base = $('#scalarheader.navbar').data('scalarheader'); if(base.checkedParents.indexOf(slug)<0){ base.checkedParents.push(slug); base.getParents(scalarapi.getNode(slug),++depth); } - }, null, 1, false, 1, 0, 20 ); + }, null, 1, false, 1, 0, 20, prov ); })(slug,depth); } } diff --git a/system/application/views/widgets/api/scalarapi.js b/system/application/views/widgets/api/scalarapi.js index 87920ffc9..bad8c4d57 100755 --- a/system/application/views/widgets/api/scalarapi.js +++ b/system/application/views/widgets/api/scalarapi.js @@ -376,7 +376,7 @@ function ScalarAPI() { 'Safari': {extensions:['m4v'], format:'M4V', player:'native', specifiesDimensions:true}, 'Chrome': {extensions:['m4v'], format:'M4V', player:'native', specifiesDimensions:true}, 'Android': {extensions:['m4v'], format:'M4V', player:'native', specifiesDimensions:true}, - 'Other': {extensions:['m4v'], format:'M4V', player:'QuickTime', specifiesDimensions:true} + 'Other': {extensions:['m4v'], format:'M4V', player:'native', specifiesDimensions:true} }}, 'MPEG-1': { name:'MPEG-1', @@ -593,7 +593,6 @@ function ScalarAPI() { contentType:'audio', browserSupport: { 'Mozilla': {extensions:['wav'], format:'WAV', player:'native', specifiesDimensions:false}, - 'Explorer': {extensions:['wav'], format:'WAV', player:'jPlayer', specifiesDimensions:false}, 'MobileSafari': {extensions:['wav'], format:'WAV', player:'native', specifiesDimensions:false}, 'Safari': {extensions:['wav'], format:'WAV', player:'native', specifiesDimensions:false}, 'Chrome': {extensions:['wav'], format:'WAV', player:'native', specifiesDimensions:false}, @@ -1842,9 +1841,10 @@ ScalarAPI.prototype.handleNodeExistsSuccess = function(json) { * @param relation If populated, will return only relations of the specified type * @param start Result number to start with * @param results Number of results to return + * @param provenance If true, will return provenance of the nodes * @return A string indicating the state of the request. */ -ScalarAPI.prototype.loadNode = ScalarAPI.prototype.loadPage = function(uriSegment, forceReload, successCallback, errorCallback, depth, references, relation, start, results) { +ScalarAPI.prototype.loadNode = ScalarAPI.prototype.loadPage = function(uriSegment, forceReload, successCallback, errorCallback, depth, references, relation, start, results, provenance) { var url = this.model.urlPrefix+uriSegment; var node = this.model.nodesByURL[this.model.urlPrefix+uriSegment]; @@ -1868,6 +1868,13 @@ ScalarAPI.prototype.loadNode = ScalarAPI.prototype.loadPage = function(uriSegmen if (results != null) { queryString += '&results='+results; } + var prov; + if (provenance == null) { + prov = 0; + } else { + prov = provenance ? 1 : 0; + } + queryString += '&prov='+prov; if (this.loadPageStatus[url] == null) { this.loadPageStatus[url] = {isLoading:false, queuedSuccessCallbacks:[], queuedErrorCallbacks:[]};