Merge pull request #3941 from mitchray/js/relocate-1

Next batch of JS extraction
ampache · May 6, 2024 · 2cad4bc · 2cad4bc
2 parents 31088e9 + c48a79b
commit 2cad4bc
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 116 deletions.
diff --git a/public/templates/js_globals.php b/public/templates/js_globals.php
@@ -40,17 +40,22 @@
     var jsAmpConfigCookieSecure = "<?php echo make_bool(AmpConfig::get('cookie_secure')); ?>";
     var jsAmpConfigGeolocation = "<?php echo make_bool(AmpConfig::get('geolocation')); ?>";
     var jsAmpConfigLibitemContextmenu = "<?php echo make_bool(AmpConfig::get('libitem_contextmenu')); ?>";
+    var jsAmpConfigPlayType = "<?php echo AmpConfig::get('play_type'); ?>";
     var jsAmpConfigSlideshowTime = "<?php echo make_bool(AmpConfig::get('slideshow_time')); ?>";
     var jsAmpConfigSidebarHideSwitcher = "<?php echo make_bool(AmpConfig::get('sidebar_hide_switcher', false)); ?>";
 
     // Preferences
     var jsPrefExistsFlickrApiKey = "<?php echo Preference::exists('flickr_api_key'); ?>";
 
+    // Misc
     var jsAjaxUrl = "<?php echo $ajaxUriRetriever->getAjaxUri(); ?>";
     var jsWebPath = "<?php echo $web_path; ?>";
     var jsAjaxServer = "<?php echo $ajaxUriRetriever->getAjaxServerUri(); ?>";
     var jsSiteTitle = "<?php echo addslashes(AmpConfig::get('site_title', '')); ?>";
     var jsCookieString = jsAmpConfigCookieSecure ? "expires: 30, path: '/', secure: true, samesite: 'Strict'" : "expires: 30, path: '/', samesite: 'Strict'";
+    var jsBasketCount = 0; // updated in rightbar.inc.php after ajax load
+
+    // Strings
     var jsHomeTitle = "<?php echo addslashes(T_('Home')); ?>";
     var jsUploadTitle = "<?php echo addslashes(T_('Upload')); ?>";
     var jsLocalplayTitle = "<?php echo addslashes(T_('Localplay')); ?>";

diff --git a/public/templates/rightbar.inc.php b/public/templates/rightbar.inc.php
@@ -45,16 +45,6 @@
 use Ampache\Repository\Model\Video;
 
 $user_id = (Core::get_global('user') instanceof User) ? Core::get_global('user')->id : -1; ?>
-<script>
-    function ToggleRightbarVisibility()
-    {
-        if ($("#rightbar").is(":visible")) {
-            $("#rightbar").slideUp();
-        } else {
-            $("#rightbar").slideDown();
-        }
-    }
-</script>
 <ul id="rb_action">
     <li>
         <?php echo Ajax::button('?page=stream&action=basket', 'play_circle', T_('Play'), 'rightbar_play'); ?>
@@ -120,20 +110,7 @@ function ToggleRightbarVisibility()
 // FIXME :: this is kludgy
 if (!defined('NO_SONGS') && Core::get_global('user') instanceof User && Core::get_global('user')->playlist) {
     $objects = Core::get_global('user')->playlist->get_items();
-} ?>
-    <script>
-        <?php if (count($objects) > 0 || (AmpConfig::get('play_type') == 'localplay')) { ?>
-            $("#content").removeClass("content-right-wild", 500);
-            $("#footer").removeClass("footer-wild", 500);
-            $("#rightbar").removeClass("hidden");
-            $("#rightbar").show("slow");
-        <?php } else { ?>
-            $("#content").addClass("content-right-wild", 500);
-            $("#footer").addClass("footer-wild", 500);
-            $("#rightbar").hide("slow");
-        <?php } ?>
-    </script>
-<?php
+}
 // Limit the number of objects we show here
 if (count($objects) > 100) {
     $truncated = (count($objects) - 100);
@@ -175,3 +152,12 @@ function ToggleRightbarVisibility()
 if (count($objects)) {
     Stream::run_playlist_method();
 } ?>
+
+<script>
+    $(document).ready(function() {
+        // necessary evils for time being
+        jsAmpConfigPlayType = "<?php echo AmpConfig::get('play_type'); ?>";
+        jsBasketCount = <?php echo (Core::get_global('user') instanceof User && Core::get_global('user')->playlist) ? count(Core::get_global('user')->playlist->get_items()) : 0; ?>;
+        RightbarInit();
+    });
+</script>
diff --git a/public/templates/show_recently_played.inc.php b/public/templates/show_recently_played.inc.php
@@ -199,12 +199,4 @@
 } ?>
     <a href="<?php echo $web_path; ?>/stats.php?action=recent_song<?php echo $user_id_a; ?>"><?php echo T_('More'); ?></a>
 </div>
-<script>
-    $(document).ready(function () {
-        $("a[rel^='prettyPhoto']").prettyPhoto({
-            social_tools: false,
-            deeplinking: false
-        });
-    });
-</script>
 <?php Ui::show_box_bottom(); ?>
diff --git a/public/templates/show_recently_played_all.inc.php b/public/templates/show_recently_played_all.inc.php
@@ -197,12 +197,4 @@
     </tr>
     </tfoot>
 </table>
-<script>
-    $(document).ready(function () {
-        $("a[rel^='prettyPhoto']").prettyPhoto({
-            social_tools: false,
-            deeplinking: false
-        });
-    });
-</script>
 <?php Ui::show_box_bottom(); ?>
diff --git a/public/templates/show_recently_skipped.inc.php b/public/templates/show_recently_skipped.inc.php
@@ -184,12 +184,4 @@
     </tr>
     </tfoot>
 </table>
-<script>
-    $(document).ready(function () {
-        $("a[rel^='prettyPhoto']").prettyPhoto({
-            social_tools: false,
-            deeplinking: false
-        });
-    });
-</script>
 <?php Ui::show_box_bottom(); ?>
diff --git a/public/templates/show_similar_songs.inc.php b/public/templates/show_similar_songs.inc.php
@@ -53,7 +53,7 @@
 $hide_drag    = in_array('cel_drag', $hide_columns);
 $show_license = AmpConfig::get('licensing') && AmpConfig::get('show_license');
 ?>
-<table id="top_tracks_<?php echo $artist->id; ?>" class="tabledata striped-rows">
+<table id="similar_songs" class="tabledata striped-rows">
     <thead>
     <tr class="th-top">
         <th class="cel_play essential"></th>
@@ -135,10 +135,3 @@
         <?php } ?>
     </tbody>
 </table>
-
-<script>
-    var index = 1;
-    var indexes = $("#similar_songs_<?php echo $artist->id; ?> .cel_play_content").each(function() {
-        $(this).html(index++);
-    });
-</script>
diff --git a/public/templates/show_top_tracks.inc.php b/public/templates/show_top_tracks.inc.php
@@ -53,7 +53,7 @@
 $hide_drag    = in_array('cel_drag', $hide_columns);
 $show_license = AmpConfig::get('licensing') && AmpConfig::get('show_license');
 ?>
-<table id="top_tracks_<?php echo $artist->id; ?>" class="tabledata striped-rows">
+<table id="top_tracks" class="tabledata striped-rows">
     <thead>
     <tr class="th-top">
         <th class="cel_play essential"></th>
@@ -136,9 +136,4 @@
     </tbody>
 </table>
 
-<script>
-    var index = 1;
-    var indexes = $("#top_tracks_<?php echo $artist->id; ?> .cel_play_content").each(function() {
-        $(this).html(index++);
-    });
-</script>
+<script>topTracksIndexes();</script>
diff --git a/public/templates/sidebar.inc.php b/public/templates/sidebar.inc.php
@@ -134,49 +134,4 @@
         </div>
     </li>
 <?php } ?>
-</ul>
-
-<script>
-$(function() {
-    $(".header").click(function () {
-
-        $header = $(this);
-        // getting the next element
-        $content = $header.next();
-        // open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
-        $content.slideToggle(500, function() {
-            $header.children(".header-img").toggleClass("expanded collapsed");
-            var sbstate = "expanded";
-            if ($header.children(".header-img").hasClass("collapsed")) {
-                sbstate = "collapsed";
-            }
-            Cookies.set('sb_' + $header.children(".header-img").attr('id'), sbstate, {<?php echo $cookie_string; ?>});
-        });
-    });
-});
-
-$(document).ready(function() {
-    // Get a string of all the cookies.
-    var cookieArray = document.cookie.split(";");
-    var result = new Array();
-    // Create a key/value array with the individual cookies.
-    for (var elem in cookieArray) {
-        var temp = cookieArray[elem].split("=");
-        // We need to trim whitespaces.
-        temp[0] = $.trim(temp[0]);
-        temp[1] = $.trim(temp[1]);
-        // Only take sb_* cookies (= sidebar cookies)
-        if (temp[0].substring(0, 3) == "sb_") {
-            result[temp[0].substring(3)] = temp[1];
-        }
-    }
-    // Finds the elements and if the cookie is collapsed, it collapsed the found element.
-    for (var key in result) {
-        if ($("#" + key).length && result[key] == "collapsed") {
-            $("#" + key).removeClass("expanded");
-            $("#" + key).addClass("collapsed");
-            $("#" + key).parent().next().slideToggle(0);
-        }
-    }
-});
-</script>
+</ul>
diff --git a/src/js/artist.js b/src/js/artist.js
@@ -0,0 +1,6 @@
+export function topTracksIndexes() {
+    var index = 1;
+    var indexes = $("#top_tracks .cel_play_content").each(function() {
+        $(this).html(index++);
+    });
+}
diff --git a/src/js/base.js b/src/js/base.js
@@ -51,16 +51,10 @@ $(function() {
 });
 
 $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto({
-        social_tools: false,
-        deeplinking: false
-    });
     if (jsAmpConfigGeolocation) {
         geolocate_user();
     }
-});
 
-$(document).ready(function(){
     if (jsAmpConfigLibitemContextmenu) {
         function libitem_action(item, action)
         {

diff --git a/src/js/main.js b/src/js/main.js
@@ -1,11 +1,15 @@
 import * as Ajax from './ajax.js';
+import * as Artist from './artist.js';
 import * as Base from './base.js';
 import * as Search from './search.js';
+import * as Sidebar from './sidebar.js';
 import * as Slideshow from './slideshow.js';
 import * as Tools from './tools.js';
 
 Object.assign(window, Ajax);
 Object.assign(window, Base);
 Object.assign(window, Tools);
 Object.assign(window, Search);
+Object.assign(window, Sidebar);
+Object.assign(window, Artist);
 Object.assign(window, Slideshow);
diff --git a/src/js/sidebar.js b/src/js/sidebar.js
@@ -27,4 +27,70 @@ $('#sidebar-header').click(function(){
     });
 
     Cookies.set('sidebar_state', newstate, {jsCookieString});
-});
+});
+
+$(function() {
+    $(".header").click(function () {
+        var $header = $(this);
+        // getting the next element
+        var $content = $header.next();
+        // open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
+        $content.slideToggle(500, function() {
+            $header.children(".header-img").toggleClass("expanded collapsed");
+            var sbstate = "expanded";
+            if ($header.children(".header-img").hasClass("collapsed")) {
+                sbstate = "collapsed";
+            }
+            Cookies.set('sb_' + $header.children(".header-img").attr('id'), sbstate, {jsCookieString});
+        });
+    });
+});
+
+$(document).ready(function() {
+    // Get a string of all the cookies.
+    var cookieArray = document.cookie.split(";");
+    var result = new Array();
+    // Create a key/value array with the individual cookies.
+    for (var elem in cookieArray) {
+        var temp = cookieArray[elem].split("=");
+        // We need to trim whitespaces.
+        temp[0] = $.trim(temp[0]);
+        temp[1] = $.trim(temp[1]);
+        // Only take sb_* cookies (= sidebar cookies)
+        if (temp[0].substring(0, 3) == "sb_") {
+            result[temp[0].substring(3)] = temp[1];
+        }
+    }
+    // Finds the elements and if the cookie is collapsed, it collapsed the found element.
+    for (var key in result) {
+        if ($("#" + key).length && result[key] == "collapsed") {
+            $("#" + key).removeClass("expanded");
+            $("#" + key).addClass("collapsed");
+            $("#" + key).parent().next().slideToggle(0);
+        }
+    }
+});
+
+// RIGHTBAR
+export function ToggleRightbarVisibility()
+{
+    if ($("#rightbar").is(":visible")) {
+        $("#rightbar").slideUp();
+    } else {
+        $("#rightbar").slideDown();
+    }
+}
+
+// kick off toggling the rightbar when it is loaded
+export function RightbarInit() {
+    if (jsBasketCount > 0 || jsAmpConfigPlayType === "localplay") {
+        $("#content").removeClass("content-right-wild", 500);
+        $("#footer").removeClass("footer-wild", 500);
+        $("#rightbar").removeClass("hidden");
+        $("#rightbar").show("slow");
+    } else {
+        $("#content").addClass("content-right-wild", 500);
+        $("#footer").addClass("footer-wild", 500);
+        $("#rightbar").hide("slow");
+    }
+}