From 4507777c365f52a79ea73482056f89926fc9a500 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Fri, 8 May 2015 21:39:43 -0400
Subject: [PATCH] Revert "Trigger page changes with hashchange. Fix back
 button"

This reverts commit b184d78c3fc7532fc9bd5463988dac95cc638448.

Conflicts:
	js/scratchx.js
---
 index.html     | 20 ++++++++++----------
 js/scratchx.js | 17 ++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/index.html b/index.html
index 68578fa..dc3c128 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@
 <main>
     <header>
         <div>
-            <a href="#home"><h1 class="scratchx-logo"><span>ScratchX</span></h1></a>
+            <a href="#home" data-action="show"><h1 class="scratchx-logo"><span>ScratchX</span></h1></a>
             <nav class="main-nav">
             Related Sites:
             <ul>
@@ -26,7 +26,7 @@
     <article id="home">
         <header>
             <div>
-                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq">Please read the FAQ before trying them.</a></aside>
+                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq" data-action="show">Please read the FAQ before trying them.</a></aside>
 
                 <h1>About ScratchX</h1>
                 <p>
@@ -38,7 +38,7 @@
                         <section>
                             <h2>Open an Extension File</h2>
                             <p>Choose a .sbx file from your local drive</p>
-                            <p><a href="#faq-sbx-file">What is a .sbx file?</a></p>
+                            <p><a href="#faq-sbx-file" data-action="show">What is a .sbx file?</a></p>
                         </section>
                         <section>
                             <button data-action="load-file">Browse for local file</button>
@@ -49,7 +49,7 @@
                         <section>
                             <h2>Open an Extension URL</h2>
                             <p>Paste the web address below</p>
-                            <p><a href="#faq-scratchx-url">What is a ScratchX URL?</a></p>
+                            <p><a href="#faq-scratchx-url" data-action="show">What is a ScratchX URL?</a></p>
                         </section>
                         <section>
                             <form class="input-plus-button url-load-form">
@@ -93,14 +93,14 @@
             <div>
                 <h2>Developer Documentation</h2>
                 <p>Developers can create new Experimental Extensions using Javascript. To learn more, read the <a href="http://llk.github.io/scratch-extension-docs/">Developer Documentation</a>.</p>
-                <p><button data-action="show" data-target="#scratch">Open editor</button></p>
+                <p><a href="#scratch" data-action="show"><button>Open editor</button></a></p>
             </div>
         </section>
     </article>
     <article id="privacy-policy">
         <section>
             <div>
-                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq">Please read the FAQ before trying them.</a></aside>
+                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq" data-action="show">Please read the FAQ before trying them.</a></aside>
                 <div>
                     <section class="main">
                         <h1>Privacy Policy</h1>
@@ -139,7 +139,7 @@
     <article id="faq">
         <section>
             <div>
-                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq">Please read the FAQ before trying them.</a></aside>
+                <aside class="warning message"><strong>Warning:</strong> These extensions are experimental. <a href="#faq" data-action="show">Please read the FAQ before trying them.</a></aside>
                 <div>
                     <section class="main">
                         <h1><abbr title="Frequently Asked Questions">FAQ</abbr></h1>
@@ -166,7 +166,7 @@
                         <p>Click the 'Save' button at the top of the page to download your project as an .sbx file on to your local computer. You can then send this file to other people, and they can upload your file onto ScratchX to play with your project.</p>
 
                         <h2 id="faq-examples">Where can I find example Experimental Extensions to play around with?</h2>
-                        <p>We have linked to a few example extensions on the <a href="#home">ScratchX</a> homepage. We plan to highlight additional extensions in the coming months.</p>
+                        <p>We have linked to a few example extensions on the <a href="#home" data-action="show">ScratchX</a> homepage. We plan to highlight additional extensions in the coming months.</p>
 
                         <h2 id="faq-scratchx-url">What is a ScratchX URL?</h2>
                         <p>Developers who make extensions for ScratchX can choose to create a custom web address or URL that points to their extension and/or demo project. Clicking on a ScratchX extension URL will take you directly to a project with an extension loaded.</p>
@@ -213,9 +213,9 @@
                 <h2>ScratchX</h2>
                 <ul>
                     <li><a href="https://scratch.mit.edu/terms_of_use/">Terms of Service</a></li>
-                    <li><a href="#privacy-policy">Privacy Policy</a></li>
+                    <li><a href="#privacy-policy" data-action="show">Privacy Policy</a></li>
                     <li><a href="mailto:scratch-extensions@media.mit.edu">Contact Us</a></li>
-                    <li><a href="#faq">FAQ</a></li>
+                    <li><a href="#faq" data-action="show">FAQ</a></li>
                     <li><a href="https://scratch.mit.edu/discuss/41/">Forums</a></li>
                 </ul>
             </nav>
diff --git a/js/scratchx.js b/js/scratchx.js
index a25fb37..bb81057 100644
--- a/js/scratchx.js
+++ b/js/scratchx.js
@@ -289,23 +289,18 @@ function JSshowWarning(extensionData) {
 
 var showClickListener = function(e) {
     /*
-     * Anything with data-action="show" should switch the view
+     * Links with data-action="static-link" should switch the view
      * to that page. Works like tabs sort of. Use like...
      *     <!-- Makes a link to the Privacy Policy section -->
-     *     <button data-target="#privacy-policy" data-action="show">Privacy Policy</button>
+     *     <a href="#privacy-policy" data-action="static-link">Privacy Policy</a>
      * 
      */
-    window.location.hash = $(this).data("target");
-}
+    var path = $(this).attr("href").substring(1);
+    showPage(path);
+};
 
 $(window).bind('hashchange', function(e) {
-    var page = '';
-    if (document.location.hash == '') {
-        page = 'home';
-    } else {
-        page = window.location.hash.substr(1);
-    }
-    showPage(page);
+    if (document.location.hash == '') showPage('home');
 });
 
 function showPage(path) {