BaseUrl is finally finished! #72

This commit is contained in:
tidusjar 2016-04-16 14:02:06 +01:00
commit 67c968e886
17 changed files with 201 additions and 64 deletions

View file

@ -11,7 +11,7 @@ var searchTemplate = Handlebars.compile(searchSource);
var albumTemplate = Handlebars.compile(albumSource);
var movieTimer = 0;
var tvimer = 0;
var base = $('#baseUrl').val();
var base = $('#baseUrl').text();
var mixItUpDefault = {
animation: { enable: true },
@ -381,16 +381,20 @@ $(document).on("click", ".change", function (e) {
generateNotify("Success! Availibility changed.", "info");
var button = $("button[custom-availibility='" + buttonId + "']");
var icon = $('#availableIcon' + buttonId);
var approvedIcon = $("#"+buttonId + "notapproved");
if (response.available) {
button.text("Mark Unavailable");
button.val("false");
button.prop("class", "btn btn-sm btn-info-outline change");
icon.prop("class", "fa fa-check");
approvedIcon.prop("class", "fa fa-check");
} else {
button.text("Mark Available");
button.prop("class", "btn btn-sm btn-success-outline change");
icon.prop("class", "fa fa-times");
approvedIcon.prop("class", "fa fa-times");
button.val("true");
}
}

View file

@ -5,6 +5,8 @@
return opts.inverse(this);
});
$(function () {
var searchSource = $("#search-template").html();
@ -12,6 +14,8 @@ $(function () {
var searchTemplate = Handlebars.compile(searchSource);
var musicTemplate = Handlebars.compile(musicSource);
var base = $('#baseUrl').text();
var searchTimer = 0;
// fix for selecting a default tab
@ -21,7 +25,7 @@ $(function () {
}
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
focusSearch($($(e.target).attr('href')))
focusSearch($($(e.target).attr('href')));
});
focusSearch($('li.active a', '#nav-tabs').first().attr('href'));
@ -172,15 +176,18 @@ $(function () {
function movieSearch() {
var query = $("#movieSearchContent").val();
query ? getMovies("/search/movie/" + query) : resetMovies();
var url = createBaseUrl(base, '/search/movie/');
query ? getMovies(url + query) : resetMovies();
}
function moviesComingSoon() {
getMovies("/search/movie/upcoming");
var url = createBaseUrl(base, '/search/movie/upcoming');
getMovies(url);
}
function moviesInTheaters() {
getMovies("/search/movie/playing");
var url = createBaseUrl(base, '/search/movie/playing');
getMovies(url);
}
function getMovies(url) {
@ -209,7 +216,9 @@ $(function () {
function tvSearch() {
var query = $("#tvSearchContent").val();
query ? getTvShows("/search/tv/" + query) : resetTvShows();
var url = createBaseUrl(base, '/search/tv/');
query ? getTvShows(url + query) : resetTvShows();
}
function getTvShows(url) {
@ -236,8 +245,9 @@ $(function () {
}
function musicSearch() {
var url = createBaseUrl(base, '/search/music/');
var query = $("#musicSearchContent").val();
query ? getMusic("/search/music/" + query) : resetMusic();
query ? getMusic(url + query) : resetMusic();
}
function getMusic(url) {
@ -266,7 +276,9 @@ $(function () {
}
function getCoverArt(artistId) {
$.ajax("/search/music/coverart/" + artistId).success(function (result) {
var url = createBaseUrl(base, '/search/music/coverart/');
$.ajax(url + artistId).success(function (result) {
if (result) {
$('#' + artistId + "imageDiv").html(" <img class='img-responsive' src='" + result + "' width='150' alt='poster'>");
}