Load tag map only when required using Ajax

lib/class/autoupdate.class.php

@@ -144,6 +144,8 @@ class AutoUpdate
             return AmpConfig::get('autoupdate_lastversion_new');
         }
 
+        debug_event('autoupdate', 'Checking latest version online...', '5');
+
         $available = false;
         $current = self::get_current_version();
         $latest = self::get_latest_version();

lib/javascript/tools.js

@@ -142,11 +142,7 @@ function handleBroadcastAction(url, id) {
 /* Edit modal dialog for artists, albums and songs */
 /***************************************************/
 
-var tag_choices;
+var tag_choices = undefined;
-
-function setTagsChoices(choices) {
-    tag_choices = choices;
-}
 
 function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_row_prefix, refresh_action) {
     var parent = this;
@@ -160,12 +156,20 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
     
     // Convert choices string ("tag0,tag1,tag2,...") to choices array
     parent.editTagChoices = new Array();
-    if (tag_choices != null && tag_choices != '') {
+    if (tag_choices == undefined && tag_choices != '') {
-        var splitted = tag_choices.split(',');
+        // Load tag map
-        var i;
+        $.ajax(jsAjaxServer + '/ajax.server.php?page=tag&action=get_tag_map', { success: function(data) {
-        for (i = 0; i < splitted.length; ++i) {
+            tag_choices = $(data).find('content').text();
-            parent.editTagChoices.push($.trim(splitted[i]));
+            if (tag_choices != '') {
-        }
+                showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_row_prefix, refresh_action);
+            }
+        }, type: 'post', dataType: 'xml' });
+        return;
+    }
+    var splitted = tag_choices.split(',');
+    var i;
+    for (i = 0; i < splitted.length; ++i) {
+        parent.editTagChoices.push($.trim(splitted[i]));
     }
     
     parent.dialog_buttons = {};

server/tag.ajax.php

@@ -28,6 +28,10 @@ if (!defined('AJAX_INCLUDE')) { exit; }
 switch ($_REQUEST['action']) {
     case 'show_add_tag':
 
+    break;
+    case 'get_tag_map':
+        $tags = Tag::get_display(Tag::get_tags());
+        $results['tags'] = $tags;
     break;
     case 'add_tag':
         debug_event('tag.ajax', 'Adding new tag...', '5');

templates/show_albums.inc.php

@@ -23,9 +23,6 @@
 $web_path = AmpConfig::get('web_path');
 $thcount = 8;
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
     <thead>

templates/show_artists.inc.php

@@ -25,9 +25,6 @@ session_start();
 $web_path = AmpConfig::get('web_path');
 $thcount = 8;
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
     <thead>

templates/show_broadcasts.inc.php

@@ -21,9 +21,6 @@
  */
 
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php' ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
     <thead>

templates/show_channels.inc.php

@@ -21,9 +21,6 @@
  */
 
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php' ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
     <thead>

templates/show_smartplaylists.inc.php

@@ -21,9 +21,6 @@
  */
 
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php' ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
     <thead>

templates/show_songs.inc.php

@@ -23,9 +23,6 @@
 $web_path = AmpConfig::get('web_path');
 $thcount = 8;
 ?>
-<script type="text/javascript">
-    setTagsChoices('<?php echo Tag::get_display(Tag::get_tags()); ?>');
-</script>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
 <table id="reorder_songs_table_<?php echo $browse->get_filter('album'); ?>" class="tabledata" cellpadding="0" cellspacing="0">
     <thead>