Skip to content

Commit 9d6a546

Browse files
authored
Merge pull request #3 from SarahZum/node-updates
Node updates
2 parents ef5d3b7 + b5664b9 commit 9d6a546

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

js/browzine.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
// Define Angular module and whitelist URL of server with Node.js script
22
var app = angular.module('viewCustom', ['angularLoad'])
3-
.constant('nodeserver', "https://yourserver.edu/primo/browzine")
3+
.constant('nodeserver', "https://yourserver.edu")
44
.config(['$sceDelegateProvider', 'nodeserver', ($sceDelegateProvider, nodeserver) => {
55
let urlWhitelist = $sceDelegateProvider.resourceUrlWhitelist();
66
urlWhitelist.push(`${nodeserver}**`);
77
$sceDelegateProvider.resourceUrlWhitelist(urlWhitelist);
88
}]);
99

1010
// Add Article In Context & Browzine Links
11-
app.controller('prmSearchResultAvailabilityLineAfterController', function($scope, $http) {
11+
app.controller('prmSearchResultAvailabilityLineAfterController', function($scope, $http, nodeserver) {
1212
var vm = this;
13-
if (vm.parentCtrl.result.pnx.addata.doi && vm.parentCtrl.result.pnx.display.type[0] == 'article') {
14-
vm.doi = vm.parentCtrl.result.pnx.addata.doi[0] || '';
15-
var articleURL = "https://yourserver.edu/primo/browzine/browzineArticleInContext?DOI=" + vm.doi;
16-
$http.jsonp(articleURL, {jsonpCallbackParam: 'callback'}).then(function(response) {
17-
$scope.article = response.data;
18-
}, function(error){
13+
if (vm.parentCtrl.result.pnx.addata.doi && vm.parentCtrl.result.pnx.display.type[0] == 'article') {
14+
vm.doi = vm.parentCtrl.result.pnx.addata.doi[0] || '';
15+
var articleURL = nodeserver + "/primo/browzine/browzineArticleInContext?DOI=" + vm.doi;
16+
$http.jsonp(articleURL, {jsonpCallbackParam: 'callback'}).then(function(response) {
17+
$scope.article = response.data;
18+
}, function(error){
1919
console.log(error);
2020
});
21-
}
22-
if (vm.parentCtrl.result.pnx.addata.issn && vm.parentCtrl.result.pnx.display.type[0] == 'journal') {
23-
vm.issn = vm.parentCtrl.result.pnx.addata.issn[0].replace("-", "") || '';
24-
var journalURL = "https://yourserver.edu/primo/browzine/browzineJournals?ISSN=" + vm.issn;
25-
$http.jsonp(journalURL, {jsonpCallbackParam: 'callback'}).then(function(response) {
26-
$scope.journal = response.data;
27-
}, function(error){
21+
}
22+
if (vm.parentCtrl.result.pnx.addata.issn && vm.parentCtrl.result.pnx.display.type[0] == 'journal') {
23+
vm.issn = vm.parentCtrl.result.pnx.addata.issn[0].replace("-", "") || '';
24+
var journalURL = nodeserver + "/primo/browzine/browzineJournals?ISSN=" + vm.issn;
25+
$http.jsonp(journalURL, {jsonpCallbackParam: 'callback'}).then(function(response) {
26+
$scope.journal = response.data;
27+
}, function(error){
2828
console.log(error);
2929
});
3030
}
3131

32-
});
32+
});
3333

3434
app.component('prmSearchResultAvailabilityLineAfter', {
35-
bindings: { parentCtrl: '<' },
36-
controller: 'prmSearchResultAvailabilityLineAfterController',
37-
template: `
38-
<div ng-if="article.data.browzineWebLink"><a href="{{ article.data.browzineWebLink }}" target="_blank"> See article in Table of Contents!</a></div>
39-
<div ng-if="journal.data[0].browzineWebLink"><a href="{{ journal.data[0].browzineWebLink }}" target="_blank"> Browse this journal in Browzine!</a></div>
40-
`
41-
});
35+
bindings: { parentCtrl: '<' },
36+
controller: 'prmSearchResultAvailabilityLineAfterController',
37+
template: `
38+
<div ng-if="article.data.browzineWebLink"><a href="{{ article.data.browzineWebLink }}" target="_blank"> See article in Table of Contents!</a></div>
39+
<div ng-if="journal.data[0].browzineWebLink"><a href="{{ journal.data[0].browzineWebLink }}" target="_blank"> Browse this journal in Browzine!</a></div>
40+
`
41+
});
4242

4343
// Add Journal Cover Images from Browzine
44-
app.controller('prmSearchResultThumbnailContainerAfterController', function($scope, $http) {
44+
app.controller('prmSearchResultThumbnailContainerAfterController', function($scope, $http, nodeserver) {
4545
var vm = this;
4646
var newThumbnail = '';
4747
if (vm.parentCtrl.item.pnx.addata.issn) {
4848
vm.issn = vm.parentCtrl.item.pnx.addata.issn[0].replace("-", "") || '';
49-
var journalURL = "https://yourserver.edu/primo/browzine/browzineJournals?ISSN=" + vm.issn;
49+
var journalURL = nodeserver + "/primo/browzine/browzineJournals?ISSN=" + vm.issn;
5050
$http.jsonp(journalURL, {jsonpCallbackParam: 'callback'}).then(function(response) {
5151
newThumbnail = response.data.data["0"].coverImageUrl;
5252
}, function(error){
@@ -56,8 +56,8 @@
5656
vm.$doCheck = function(changes) {
5757
if (vm.parentCtrl.selectedThumbnailLink) {
5858
if (newThumbnail != '' && (vm.parentCtrl.selectedThumbnailLink.linkURL.indexOf("icon_journal.png") != -1 || vm.parentCtrl.selectedThumbnailLink.linkURL.indexOf("img/icon_article.png") != -1) ) {
59-
vm.parentCtrl.selectedThumbnailLink.linkURL = newThumbnail;
60-
}
59+
vm.parentCtrl.selectedThumbnailLink.linkURL = newThumbnail;
60+
}
6161
}
6262
};
6363
});

0 commit comments

Comments
 (0)