Skip to content

Commit 58a33c2

Browse files
JohnnyTheTankJohnnyTheTank
committed
fixed prevPageToken bug
1 parent 858c056 commit 58a33c2

File tree

3 files changed

+49
-57
lines changed

3 files changed

+49
-57
lines changed

‎dist/angular-youtube-api-factory.js

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
@name: angular-youtube-api-factory
3-
@version: 0.6.1 (22-09-2016)
3+
@version: 0.6.1 (23-09-2016)
44
@author: Jonathan Hornung
55
@url: https://github.com/JohnnyTheTank/angular-youtube-api-factory#readme
66
@license: MIT
@@ -89,15 +89,11 @@ angular.module("jtt_youtube", [])
8989
object: {
9090
key: _params.key,
9191
},
92-
url: "",
92+
url: '',
9393
};
9494

95-
if (angular.isDefined(_params.part)) {
96-
youtubeSearchData.object.part = _params.part;
97-
}
98-
9995
switch (_type) {
100-
case "videosFromChannelById":
96+
case 'videosFromChannelById':
10197

10298
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
10399
['part', 'id,snippet'],
@@ -117,14 +113,14 @@ angular.module("jtt_youtube", [])
117113
'fields'
118114
]);
119115

120-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
121-
122-
if (angular.isDefined(_params.nextPageToken)) {
123-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
116+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
117+
118+
if (_params.nextPageToken || _params.prevPageToken) {
119+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
124120
}
125121
break;
126122

127-
case "videosFromSearchByParams":
123+
case 'videosFromSearchByParams':
128124

129125
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
130126
['part', 'id,snippet'],
@@ -148,17 +144,17 @@ angular.module("jtt_youtube", [])
148144
youtubeSearchData.object.locationRadius = _params.locationRadius;
149145
} else {
150146
if (angular.isDefined(_params.location)) {
151-
youtubeSearchData.object.locationRadius = "5000m"
147+
youtubeSearchData.object.locationRadius = '5000m'
152148
}
153149
}
154150

155-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
156-
if (angular.isDefined(_params.nextPageToken)) {
157-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
151+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
152+
if (_params.nextPageToken || _params.prevPageToken) {
153+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
158154
}
159155
break;
160156

161-
case "videosFromPlaylistById":
157+
case 'videosFromPlaylistById':
162158

163159
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
164160
['part', 'id,snippet'],
@@ -168,34 +164,34 @@ angular.module("jtt_youtube", [])
168164
'fields'
169165
]);
170166

171-
youtubeSearchData.url = this.getApiBaseUrl() + "playlistItems?";
172-
if (angular.isDefined(_params.nextPageToken)) {
173-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
167+
youtubeSearchData.url = this.getApiBaseUrl() + 'playlistItems?';
168+
if (_params.nextPageToken || _params.prevPageToken) {
169+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
174170
}
175171
break;
176172

177-
case "videoById":
173+
case 'videoById':
178174
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
179175
['part', 'id,snippet,contentDetails,statistics'],
180176
]);
181177

182178
youtubeSearchData.object.id = _params.videoId;
183179

184-
youtubeSearchData.url = this.getApiBaseUrl() + "videos?";
185-
if (angular.isDefined(_params.nextPageToken)) {
186-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
180+
youtubeSearchData.url = this.getApiBaseUrl() + 'videos?';
181+
if (_params.nextPageToken || _params.prevPageToken) {
182+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
187183
}
188184
break;
189185

190-
case "channelById":
186+
case 'channelById':
191187
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
192188
['part', 'id,snippet'],
193189
['type', 'channel']
194190
]);
195191

196-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
197-
if (angular.isDefined(_params.nextPageToken)) {
198-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
192+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
193+
if (_params.nextPageToken || _params.prevPageToken) {
194+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
199195
}
200196
break;
201197
}

‎dist/angular-youtube-api-factory.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-youtube-api-factory.js

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,11 @@ angular.module("jtt_youtube", [])
8282
object: {
8383
key: _params.key,
8484
},
85-
url: "",
85+
url: '',
8686
};
8787

88-
if (angular.isDefined(_params.part)) {
89-
youtubeSearchData.object.part = _params.part;
90-
}
91-
9288
switch (_type) {
93-
case "videosFromChannelById":
89+
case 'videosFromChannelById':
9490

9591
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
9692
['part', 'id,snippet'],
@@ -110,14 +106,14 @@ angular.module("jtt_youtube", [])
110106
'fields'
111107
]);
112108

113-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
114-
115-
if (angular.isDefined(_params.nextPageToken)) {
116-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
109+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
110+
111+
if (_params.nextPageToken || _params.prevPageToken) {
112+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
117113
}
118114
break;
119115

120-
case "videosFromSearchByParams":
116+
case 'videosFromSearchByParams':
121117

122118
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
123119
['part', 'id,snippet'],
@@ -141,17 +137,17 @@ angular.module("jtt_youtube", [])
141137
youtubeSearchData.object.locationRadius = _params.locationRadius;
142138
} else {
143139
if (angular.isDefined(_params.location)) {
144-
youtubeSearchData.object.locationRadius = "5000m"
140+
youtubeSearchData.object.locationRadius = '5000m'
145141
}
146142
}
147143

148-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
149-
if (angular.isDefined(_params.nextPageToken)) {
150-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
144+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
145+
if (_params.nextPageToken || _params.prevPageToken) {
146+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
151147
}
152148
break;
153149

154-
case "videosFromPlaylistById":
150+
case 'videosFromPlaylistById':
155151

156152
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
157153
['part', 'id,snippet'],
@@ -161,34 +157,34 @@ angular.module("jtt_youtube", [])
161157
'fields'
162158
]);
163159

164-
youtubeSearchData.url = this.getApiBaseUrl() + "playlistItems?";
165-
if (angular.isDefined(_params.nextPageToken)) {
166-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
160+
youtubeSearchData.url = this.getApiBaseUrl() + 'playlistItems?';
161+
if (_params.nextPageToken || _params.prevPageToken) {
162+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
167163
}
168164
break;
169165

170-
case "videoById":
166+
case 'videoById':
171167
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
172168
['part', 'id,snippet,contentDetails,statistics'],
173169
]);
174170

175171
youtubeSearchData.object.id = _params.videoId;
176172

177-
youtubeSearchData.url = this.getApiBaseUrl() + "videos?";
178-
if (angular.isDefined(_params.nextPageToken)) {
179-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
173+
youtubeSearchData.url = this.getApiBaseUrl() + 'videos?';
174+
if (_params.nextPageToken || _params.prevPageToken) {
175+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
180176
}
181177
break;
182178

183-
case "channelById":
179+
case 'channelById':
184180
youtubeSearchData = this.fillDataInObjectByList(youtubeSearchData, _params, [
185181
['part', 'id,snippet'],
186182
['type', 'channel']
187183
]);
188184

189-
youtubeSearchData.url = this.getApiBaseUrl() + "search?";
190-
if (angular.isDefined(_params.nextPageToken)) {
191-
youtubeSearchData.url += "pageToken=" + _params.nextPageToken + "&";
185+
youtubeSearchData.url = this.getApiBaseUrl() + 'search?';
186+
if (_params.nextPageToken || _params.prevPageToken) {
187+
youtubeSearchData.url += 'pageToken=' + (_params.nextPageToken || _params.prevPageToken) + '&';
192188
}
193189
break;
194190
}

0 commit comments

Comments
 (0)