Merge pull request #586 from mariroz/wb-link-in-wb

wallabag a link in wallabag now in default theme, issue #505

2 files changed, 2 insertions, 79 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 144bcaa6..acc9fa3d 100755
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -11,4 +11,5 @@
         <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery.cookie.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/saveLink.js"></script>
         <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js
index da644fbe..00470fbf 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/js/init.js
@@ -1,10 +1,7 @@
 $.fn.ready(function() {
 
   var $listmode = $('#listmode'),
-      $listentries = $("#list-entries"),
-      $bagit = $('#bagit'),
-      $bagitForm = $('#bagit-form');
-      $bagitFormForm = $('#bagit-form-form');
+      $listentries = $("#list-entries");
 
   /* ==========================================================================
      Menu
@@ -48,79 +45,4 @@ $.fn.ready(function() {
     $listmode.addClass("tablemode");
   }
 
-  /* ==========================================================================
-    bag it link and close button
-    ========================================================================== */
-
-  function toggleSaveLinkForm(url) {
-    $bagit.toggleClass("active-current");
-    $bagitForm.toggle();
-    $('#content').toggleClass("opacity03");
-    if (url !== 'undefined' && url) {
-      $('#plainurl').val(url);
-    }
-    $('#plainurl').focus();
-  }
-
-  $bagit.click(function(){
-    toggleSaveLinkForm();
-  });
-
-  $("#bagit-form-close").click(function(){
-    toggleSaveLinkForm();
-  });
-
-
-  //send "bag it link" form request via ajax
-  $bagitFormForm.submit( function(event) {
-    $bagitFormForm.css("cursor", "wait");
-    $("#add-link-result").empty();
-
-    $.ajax({
-        type: $bagitFormForm.attr('method'),
-        url: $bagitFormForm.attr('action'),
-        data: $bagitFormForm.serialize(),
-        success: function(data) {
-          $('#add-link-result').html("Done!");
-          $('#plainurl').val('');
-          $('#plainurl').blur('');
-          $bagitFormForm.css("cursor", "auto");
-          //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay
-        },
-        error: function(data) {
-          $('#add-link-result').html("Failed!");
-          $bagitFormForm.css("cursor", "auto");
-        }
-    });
-
-    event.preventDefault();
-  });
-
-  /* ==========================================================================
-    Keyboard gestion
-    ========================================================================== */
-
-  $(window).keydown(function(e){
-    if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) {
-      toggleSaveLinkForm();
-      return false;
-    }
-  });
-
-  /* ==========================================================================
-  Process all links inside an article
-  ========================================================================== */
-
-  $("article a[href^='http']").after(function() {
-        return " <a href=\"" + $(this).attr('href') + "\" class=\"add-to-wallabag-link-after\" alt=\"add to wallabag\" title=\"add to wallabag\">w</a> ";
-  });
-
-  $(".add-to-wallabag-link-after").click(function(event){
-    toggleSaveLinkForm($(this).attr('href'));
-    event.preventDefault();
-  });
-
-
-
-
 });