Merge pull request #2704 from OmgImAlexis/develop

Converted to meta function && removed unneeded comments

gui/slick/js/new/comingEpisodes.js

 $(document).ready(function(){
-    if($('meta[data-var="sickbeard.COMING_EPS_LAYOUT"]').data('content') == 'list'){
+    if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['list'])){
         var sortCodes = {'date': 0, 'show': 1, 'network': 4};
-        var sort = $('meta[data-var="sickbeard.COMING_EPS_SORT"]').data('content');
+        var sort = getMeta('sickbeard.COMING_EPS_SORT');
         var sortList = (sort in sortCodes) ? [[sortCodes[sort], 0]] : [[0, 0]];
 
         $('#showListTable:has(tbody tr)').tablesorter({
@@ -26,7 +26,8 @@ $(document).ready(function(){
 
         $('#srRoot').ajaxEpSearch();
     }
-    if($('meta[data-var="sickbeard.COMING_EPS_LAYOUT"]').data('content') == 'banner' || $('meta[data-var="sickbeard.COMING_EPS_LAYOUT"]').data('content') == 'poster'){
+
+    if(isMeta('sickbeard.COMING_EPS_LAYOUT', ['banner', 'poster'])){
         $('#srRoot').ajaxEpSearch({'size': 16, 'loadingImage': 'loading16' + themeSpinner + '.gif'});
         $('.ep_summary').hide();
         $('.ep_summaryTrigger').click(function() {

gui/slick/js/new/config_subtitles.js

-$(document).ready(function() {
-    $("#subtitles_languages").tokenInput([$('meta[data-var="subtitles.subtitleLanguageFilter"]').data('content')], {
-        method: "POST",
-        hintText: "Write to search a language and select it",
-        preventDuplicates: true,
-        prePopulate: [$('meta[data-var="prePopulate"]').data('content')]
-    });
-});
-$('#config-components').tabs();
-$('#subtitles_dir').fileBrowser({ title: 'Select Subtitles Download Directory' });

gui/slick/js/new/editShow.js

@@ -11,7 +11,7 @@ $('#submit').click(function(){
 
     $("#exceptions_list").val(all_exceptions);
 
-    if($('meta[data-var="show.is_anime"]').data('content') === 'True') generate_bwlist();
+    if(metaToBool('show.is_anime')) generate_bwlist();
 });
 $('#addSceneName').click(function() {
     var scene_ex = $('#SceneName').val();

gui/slick/js/new/history.js

@@ -3,7 +3,7 @@ $(document).ready(function(){
         widgets: ['zebra', 'filter'],
         sortList: [[0,1]],
         textExtraction: (function(){
-            if($('meta[data-var="layout"]').data('content') == 'detailed'){
+            if(isMeta('sickbeard.HOME_LAYOUT', ['detailed'])){
                 return {
                     0: function(node) { return $(node).find('time').attr('datetime'); },
                     4: function(node) { return $(node).find("span").text().toLowerCase(); }
@@ -18,7 +18,7 @@ $(document).ready(function(){
             }
         }()),
         headers: (function(){
-            if($('meta[data-var="layout"]').data('content') == 'detailed'){
+            if(isMeta('sickbeard.HOME_LAYOUT', ['detailed'])){
                 return {
                     0: { sorter: 'realISODate' },
                     4: { sorter: 'quality' }

gui/slick/js/new/home.js

@@ -138,8 +138,8 @@ $(document).ready(function(){
     $.each($container, function (j){
         this.isotope({
             itemSelector: '.show',
-            sortBy : $('meta[data-var="sickbeard.POSTER_SORTBY"]').data('content'),
-            sortAscending: $('meta[data-var="sickbeard.POSTER_SORTDIR"]').data('content'),
+            sortBy : getMeta('sickbeard.POSTER_SORTBY'),
+            sortAscending: getMeta('sickbeard.POSTER_SORTDIR'),
             layoutMode: 'masonry',
             masonry: {
                 columnWidth: 13,

gui/slick/js/new/home_trendingShows.js

@@ -15,7 +15,7 @@ $(document).ready(function(){
         getSortData: {
             name: function( itemElem ) {
                 var name = $(itemElem).attr('data-name') || '';
-                return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'False' ? name.replace(/^(The|A|An)\s/i, '') : name).toLowerCase();
+                return (metaToBool('sickbeard.SORT_ARTICLE') ? name : name.replace(/^(The|A|An)\s/i, '')).toLowerCase();
             },
             rating: '[data-rating] parseInt',
             votes: '[data-votes] parseInt',
@@ -52,4 +52,3 @@ $(document).ready(function(){
         $('#container').isotope({sortAscending: ('asc' == this.value)});
     });
 });
-window.setInterval('location.reload(true)', 600000); // Refresh every 10 minutes

gui/slick/js/new/meta.js

@@ -7,3 +7,8 @@ function metaToBool(pyVar){
 function getMeta(pyVar){
     return $('meta[data-var="' + pyVar + '"]').data('content');
 }
+
+function isMeta(pyVar, result){
+    var reg = new RegExp(result.length > 1 ? result.join('|') : result);
+    return (reg).test($('meta[data-var="' + pyVar + '"]').data('content'));
+}

gui/slick/js/new/parsers.js

@@ -62,13 +62,10 @@ $.tablesorter.addParser({
         nums[0] = parseInt(nums[0]);
         nums[1] = parseInt(nums[1]);
 
-        if (nums[0] === 0)
-          return nums[1];
-
-        var finalNum = parseInt(($('meta[data-var="max_download_count"]').data('content'))*nums[0]/nums[1]);
+        if (nums[0] === 0) return nums[1];
+        var finalNum = parseInt((getMeta('max_download_count'))*nums[0]/nums[1]);
         var pct = Math.round((nums[0]/nums[1])*100) / 1000;
-        if (finalNum > 0)
-          finalNum += nums[0];
+        if (finalNum > 0) finalNum += nums[0];
 
         return finalNum + pct;
     },

gui/slick/js/new/trendingShows.js

@@ -12,7 +12,7 @@ $(document).ready(function(){
             getSortData: {
                 name: function(itemElem) {
                     var name = $(itemElem).attr('data-name') || '';
-                    return ($('meta[data-var="sickbeard.SORT_ARTICLE"]').data('content') == 'False' ? name.replace(/^(The|A|An)\s/i, '') : name).toLowerCase();
+                    return (metaToBool('sickbeard.SORT_ARTICLE') ? name : name.replace(/^(The|A|An)\s/i, '')).toLowerCase();
                 },
                 rating: '[data-rating] parseInt',
                 votes: '[data-votes] parseInt',

gui/slick/js/script.js

@@ -138,7 +138,7 @@ $(document).ready(function () {
     init();
     $(document).ready(function() {
         $('.dropdown-toggle').dropdownHover();
-        if(['True', 1].indexOf($('meta[data-var="sickbeard.FUZZY_DATING"]').data('content')) >= 0){
+        if(metaToBool('sickbeard.FUZZY_DATING')){
             $.timeago.settings.allowFuture = true;
             $.timeago.settings.strings = {
                 prefixAgo: null,
@@ -148,13 +148,13 @@ $(document).ready(function () {
                 seconds: "less than a minute",
                 minute: "about a minute",
                 minutes: "%d minutes",
-                hour: "about an hour",
-                hours: "about %d hours",
+                hour: "an hour",
+                hours: "%d hours",
                 day: "a day",
                 days: "%d days",
-                month: "about a month",
+                month: "a month",
                 months: "%d months",
-                year: "about a year",
+                year: "a year",
                 years: "%d years",
                 wordSeparator: " ",
                 numbers: []

gui/slick/views/config_subtitles.mako

@@ -8,7 +8,6 @@
 <script type="text/javascript" src="${srRoot}/js/configSubtitles.js?${sbPID}"></script>
 <script type="text/javascript" src="${srRoot}/js/config.js"></script>
 <script type="text/javascript" src="${srRoot}/js/lib/jquery.tokeninput.js"></script>
-## <script type="text/javascript" src="${srRoot}/js/new/config_subtitles.js"></script>
 <script>
 $(document).ready(function() {
     $("#subtitles_languages").tokenInput([${','.join("{\"id\": \"" + lang.opensubtitles + "\", name: \"" + lang.name + "\"}" for lang in subtitles.subtitleLanguageFilter())}], {