瀏覽代碼

make #2350 work using replaceState

Hakim El Hattab 5 年之前
父節點
當前提交
b8de5e02d2
共有 1 個文件被更改,包括 11 次插入6 次删除
  1. 11 6
      js/reveal.js

+ 11 - 6
js/reveal.js

@@ -4290,19 +4290,24 @@
 			writeURLTimeout = setTimeout( writeURL, delay );
 		}
 		else if( currentSlide ) {
+			// If we're configured to push to history OR the history
+			// API is not avaialble.
 			if( config.history || !window.history ) {
 				window.location.hash = locationHash();
 			}
+			// If we're configured to refelct the current slide in the
+			// URL without pushing to history.
 			else if( config.hash ) {
-				window.history.replaceState(null, null, '#' + locationHash());
+				window.history.replaceState( null, null, '#' + locationHash() );
+			}
+			// If history and hash are both disabled, a hash may still
+			// be added to the URL by clicking on a href with a hash
+			// target. Counter this by always removing the hash.
+			else {
+				window.history.replaceState( null, null, window.location.pathname + window.location.search );
 			}
-      else {
-        window.location.hash = '';
-      }
 		}
 
-
-
 	}
 	/**
 	 * Retrieves the h/v location and fragment of the current,