From c70d7afab844192f327eea83dab1ccbfc01ef650 Mon Sep 17 00:00:00 2001
From: rolla <raitis.rolis@gmail.com>
Date: Tue, 15 Aug 2017 02:29:28 +0300
Subject: [PATCH 1/2] Added: JS file to catch edit form actions;

---
 lib/javascript/tools-extend.js | 69 ++++++++++++++++++++++++++++++++++
 lib/javascript/tools.js        |  2 +
 templates/header.inc.php       |  1 +
 3 files changed, 72 insertions(+)
 create mode 100644 lib/javascript/tools-extend.js

diff --git a/lib/javascript/tools-extend.js b/lib/javascript/tools-extend.js
new file mode 100644
index 00000000000..a7e5f3fae14
--- /dev/null
+++ b/lib/javascript/tools-extend.js
@@ -0,0 +1,69 @@
+
+function getFormData($form){
+  var unindexed_array = $form.serializeArray();
+  var indexed_array = {};
+
+  $.map(unindexed_array, function(n, i){
+    indexed_array[n['name']] = n['value'];
+  });
+
+  return indexed_array;
+}
+
+// Cookies
+function createCookie(name, value, days) {
+  if (days) {
+    var date = new Date();
+    if (days) {date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+    var expires = "; expires=" + date.toGMTString();
+  }
+  else var expires = "";
+
+  document.cookie = name + "=" + value + expires + "; path=/";
+}
+
+function readCookie(name) {
+  var nameEQ = name + "=";
+  var ca = document.cookie.split(';');
+  for (var i = 0; i < ca.length; i++) {
+    var c = ca[i];
+    while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+  }
+  return null;
+}
+
+function eraseCookie(name) {
+  createCookie(name, "", -1);
+}
+
+$(document).on('click', '.tagit-new', function(){
+  var utilsApiEnpoint = '//utils.dev/api/genre/add';
+  var currentForm = $(this).closest('form.edit_dialog_content');
+  var formId = currentForm.attr('id');
+
+  console.debug(formId);
+  //var tuneid = currentForm.find("input[name='id']");
+
+  //console.debug(getFormData(currentForm));
+
+  $( ".ui-dialog-buttonset span:contains('Save')" ).first().on('click', function(){
+    var currentData = getFormData(currentForm);
+
+    console.debug(getFormData(currentForm));
+
+    $.getJSON(utilsApiEnpoint, {
+      edit_tags: currentData.edit_tags,
+      object_id: currentData.id,
+      object_type: currentData.type.replace('_row', ''),
+      user: readCookie('ampache_user')
+    },
+    function (response){
+      console.debug(response)
+    });
+
+  });
+
+  //console.debug(currentForm.);
+})
+
diff --git a/lib/javascript/tools.js b/lib/javascript/tools.js
index 7fdbf61e439..6dd9dd26e44 100644
--- a/lib/javascript/tools.js
+++ b/lib/javascript/tools.js
@@ -266,6 +266,7 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
 
     parent.dialog_buttons = {};
     this.dialog_buttons[jsSaveTitle] = function () {
+        /*
         $.ajax({
             url: parent.saveUrl,
             type: 'POST',
@@ -300,6 +301,7 @@ function showEditDialog(edit_type, edit_id, edit_form_id, edit_title, refresh_ro
                 $('#editdialog').dialog('close');
             }
         });
+        */
     }
     this.dialog_buttons[jsCancelTitle] = function() {
         $('#editdialog').dialog('close');
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 19226080d57..37f8ed263b6 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -79,6 +79,7 @@
         <script src="<?php echo $web_path; ?>/lib/javascript/base.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/javascript/tools.js" language="javascript" type="text/javascript"></script>
+        <script src="<?php echo $web_path; ?>/lib/javascript/tools-extend.js" language="javascript" type="text/javascript"></script>
 
         <script type="text/javascript" charset="utf-8">
             $(document).ready(function(){

From 3a15d1ced65d56d5e5536bbcf98ff781a756a6a2 Mon Sep 17 00:00:00 2001
From: rolla <raitis.rolis@gmail.com>
Date: Tue, 22 Aug 2017 00:25:07 +0300
Subject: [PATCH 2/2] Very first version of genring;

---
 lib/javascript/tools-extend.js | 129 +++++++++++++++++++++++++++------
 templates/header.inc.php       |  17 +++--
 2 files changed, 118 insertions(+), 28 deletions(-)

diff --git a/lib/javascript/tools-extend.js b/lib/javascript/tools-extend.js
index a7e5f3fae14..fb8d0514307 100644
--- a/lib/javascript/tools-extend.js
+++ b/lib/javascript/tools-extend.js
@@ -1,4 +1,12 @@
 
+//import notie from 'notie'
+
+var utilsApiEnpoint = '//utils.dev/api/genre/add';
+var currentData = {};
+var previousEdit = '';
+var currentForm = {};
+
+
 function getFormData($form){
   var unindexed_array = $form.serializeArray();
   var indexed_array = {};
@@ -14,7 +22,9 @@ function getFormData($form){
 function createCookie(name, value, days) {
   if (days) {
     var date = new Date();
-    if (days) {date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+    if (days) {
+      date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+    }
     var expires = "; expires=" + date.toGMTString();
   }
   else var expires = "";
@@ -37,33 +47,110 @@ function eraseCookie(name) {
   createCookie(name, "", -1);
 }
 
-$(document).on('click', '.tagit-new', function(){
-  var utilsApiEnpoint = '//utils.dev/api/genre/add';
-  var currentForm = $(this).closest('form.edit_dialog_content');
-  var formId = currentForm.attr('id');
+//assuming "b" contains a subsequence containing
+//all of the letters in "a" in the same order
+function getDifference(a, b)
+{
+    var i = 0;
+    var j = 0;
+    var result = "";
+
+    while (j < b.length)
+    {
+        if (a[i] != b[j] || i == a.length)
+            result += b[j];
+        else
+            i++;
+        j++;
+    }
+    return result;
+}
+
+// Wait for element to exist.
+function elementLoaded(el, cb) {
+  if ($(el).length) {
+    console.debug('elementLoaded');
+    cb($(el));
+  } else {
+    // Repeat every 500ms.
+    setTimeout(function() {
+      elementLoaded(el, cb)
+    }, 500);
+  }
+}
+
+
+// Wait for element gone.
+function elementNotLoaded(el, cb) {
+  if (!$(el).length) {
+    console.debug('elementNotLoaded');
+    setTimeout(function() {
+      elementNotLoaded(el, cb)
+    }, 500);
+  } else {
+
+    cb($(el));
+  }
+}
+
+function searchElement() {
+  elementLoaded('.edit_dialog_content', function(el) {
+    // Element is ready to use.
+    currentForm = el;
+
+    //console.debug(currentForm.attr('id'));
+
+    currentData = getFormData(currentForm);
+    previousEdit = currentData.edit_tags;
+
+    notie.alert({ type: 2, text: 'Only Tags/Genres working now!', time: 5});
+  });
+}
+
+elementNotLoaded('.edit_dialog_content', function(el) {
+  searchElement();
+});
+
+searchElement();
 
-  console.debug(formId);
-  //var tuneid = currentForm.find("input[name='id']");
+/*
+$(document).on('click', '.tagit-new', function(){
 
-  //console.debug(getFormData(currentForm));
+});
+*/
 
-  $( ".ui-dialog-buttonset span:contains('Save')" ).first().on('click', function(){
-    var currentData = getFormData(currentForm);
+$(document).on('click', ".ui-dialog-buttonset span:contains('Save')" , function() {
+  currentData = getFormData(currentForm);
 
-    console.debug(getFormData(currentForm));
+  //console.debug(previousEdit);
+  //console.debug(currentData.edit_tags);
+  //console.debug(getDifference(previousEdit, currentData.edit_tags));
 
-    $.getJSON(utilsApiEnpoint, {
-      edit_tags: currentData.edit_tags,
+  $.getJSON(utilsApiEnpoint, {
+      edit_tags: typeof previousEdit == "undefined" ? currentData.edit_tags : getDifference(previousEdit, currentData.edit_tags),
       object_id: currentData.id,
       object_type: currentData.type.replace('_row', ''),
       user: readCookie('ampache_user')
-    },
-    function (response){
-      console.debug(response)
-    });
-
+  },
+  function(response) {
+
+    if (response.length) {
+
+      notie.alert({ type: 'success', text: 'Tune successfully Genred!', time: 2 }); // Hides after 2 seconds
+
+      $('#editdialog').dialog('close');
+
+      var reloadp = window.location;
+      var hash = window.location.hash.substring(1);
+      if (hash && hash.indexOf('.php') > -1) {
+        reloadp = jsWebPath + '/' + hash;
+      }
+      loadContentPage(reloadp);
+      searchElement();
+    }
+  },
+  function(error) {
+    notie.alert({ type: 3, text: 'Ouch... something goes wrong!', stay: true});
   });
 
-  //console.debug(currentForm.);
-})
-
+});
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 37f8ed263b6..a924e44875a 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -60,6 +60,8 @@
         <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery-mediaTable/jquery.mediaTable.css" type="text/css" media="screen" />
         <link rel="stylesheet" href="<?php echo $web_path; ?>/lib/components/datetimepicker/jquery.datetimepicker.css" type="text/css" media="screen" />
         <link rel="stylesheet" href="<?php echo $web_path; ?>/lib/components/jQuery-contextMenu/dist/jquery.contextMenu.min.css" type="text/css" media="screen" />
+        <link rel="stylesheet" type="text/css" href="https://unpkg.com/notie/dist/notie.min.css">
+
         <script src="<?php echo $web_path; ?>/lib/components/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/components/jquery-ui/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/components/prettyphoto/js/jquery.prettyPhoto.js" language="javascript" type="text/javascript"></script>
@@ -79,6 +81,7 @@
         <script src="<?php echo $web_path; ?>/lib/javascript/base.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/lib/javascript/tools.js" language="javascript" type="text/javascript"></script>
+        <script src="https://unpkg.com/notie"></script>
         <script src="<?php echo $web_path; ?>/lib/javascript/tools-extend.js" language="javascript" type="text/javascript"></script>
 
         <script type="text/javascript" charset="utf-8">
@@ -291,7 +294,7 @@ function update_action()
                 }
             });
         </script>
-        
+
         <?php if (AmpConfig::get('cookie_disclaimer') && !isset($_COOKIE['cookie_disclaimer'])) {
             ?>
         <script type="text/javascript" language="javascript">
@@ -309,7 +312,7 @@ function update_action()
         </script>
         <?php
         } ?>
-        
+
         <?php if (AmpConfig::get('libitem_contextmenu')) {
             ?>
         <script type="text/javascript" language="javascript">
@@ -318,14 +321,14 @@ function libitem_action(item, action)
                 var iinfo = item.attr('id').split('_', 2);
                 var object_type = iinfo[0];
                 var object_id = iinfo[1];
-                
+
                 if (action !== undefined && action !== '') {
                     ajaxPut(jsAjaxUrl + action + '&object_type=' + object_type + '&object_id=' + object_id);
                 } else {
                     showPlaylistDialog(this, object_type, object_id);
                 }
             }
-            
+
             $.contextMenu({
                 selector: ".libitem_menu",
                 items: {
@@ -339,7 +342,7 @@ function libitem_action(item, action)
         </script>
         <?php
         } ?>
-        
+
         <!-- rfc3514 implementation -->
         <div id="rfc3514" style="display:none;">0x0</div>
         <div id="notification" class="notification-out"><img src="<?php echo $web_path; ?>/images/icon_info.png" /><span id="notification-content"></span></div>
@@ -485,7 +488,7 @@ function libitem_action(item, action)
             <div id="ajax-loading">Loading . . .</div>
             <div id="util_div" style="display:none;"></div>
             <iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo $web_path; ?>/util.php"></iframe>
-            
+
             <div id="content" class="content-<?php echo AmpConfig::get('ui_fixed') ? (AmpConfig::get('topmenu') ? 'fixed-topmenu' : 'fixed') : 'float'; ?> <?php echo(($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'content-right-wild'); echo $isCollapsed ? ' content-left-wild' : ''; ?>">
 
                 <?php
@@ -496,7 +499,7 @@ function libitem_action(item, action)
                             echo '<br />';
                         }
                         $count_temp_playlist = count($GLOBALS['user']->playlist->get_items());
-                        
+
                         if (AmpConfig::get('int_config_version') != AmpConfig::get('config_version')) {
                             ?>
                             <div class="fatalerror">