Merge pull request #809 from ArthurHoaro/cleanup/inline-js

Remove inline JS and add LibreJS headers in JS files

1 files changed, 6 insertions, 36 deletions

diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index b9df32d9..baa033af 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -67,7 +67,7 @@
     <div class="tools-item">
       <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t},
                 {'then click ✚Shaare link button in any page you want to share'|t}"
-         onclick="return alertBookmarklet();"
+         class="bookmarklet-link"
          href="javascript:(
           function(){
             var%20url%20=%20location.href;
@@ -86,8 +86,8 @@
     <div class="tools-item">
       <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t},
                 {'Then click ✚Add Note button anytime to start composing a private Note (text post) to your Shaarli'|t}"
-         onclick="return alertBookmarklet();"
-         href="?private=1&amp;post=">
+         href="?private=1&amp;post="
+         class="bookmarklet-link">
         <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add Note'|t}</span>
       </a>
     </div>
@@ -103,7 +103,7 @@
 
       <div class="tools-item">
         <a title="{'Click on this button to add Shaarli to the 'Share this page' button in Firefox"
-           onclick="activateFirefoxSocial(this)">
+           id="ff-social-button">
         <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add to'|t} Firefox Social</span>
         </a>
       </div>
@@ -142,38 +142,8 @@
 </div>
 
 {include="page.footer"}
-
-<script>
-  {if="$sslenabled"}
-    function activateFirefoxSocial(node) {
-      var loc = location.href;
-      var baseURL = loc.substring(0, loc.lastIndexOf("/"));
-
-      // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable.
-      var data = {
-        name: "{$shaarlititle}",
-        description: "The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community.",
-        author: "Shaarli",
-        version: "1.0.0",
-
-        iconURL: baseURL + "/images/favicon.ico",
-        icon32URL: baseURL + "/images/favicon.ico",
-        icon64URL: baseURL + "/images/favicon.ico",
-
-        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
-        homepageURL: baseURL
-      };
-      node.setAttribute("data-service", JSON.stringify(data));
-
-      var activate = new CustomEvent("ActivateSocialFeature");
-      node.dispatchEvent(activate);
-    }
-  {/if}
-  function alertBookmarklet() {
-    alert({"'Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link'"|t});
-    return false;
-  }
-</script>
+<input type="hidden" id="bookmarklet-alert"
+       value="{'Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link'|t}">
 </body>
 </html>