From 8579f2f4981f498c92e7e3f5701b0d3eb4c971e7 Mon Sep 17 00:00:00 2001
From: Brad Robertson <bradleyrobertson@gmail.com>
Date: Tue, 25 Oct 2011 23:00:24 -0400
Subject: [PATCH] fix 542 pushState was called with wrong number of args

---
 src/scrollable/scrollable.navigator.js |  4 +-
 test/scrollable/history.html           | 84 ++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 test/scrollable/history.html

diff --git a/src/scrollable/scrollable.navigator.js b/src/scrollable/scrollable.navigator.js
index c2f6ef1..451dba8 100644
--- a/src/scrollable/scrollable.navigator.js
+++ b/src/scrollable/scrollable.navigator.js
@@ -60,7 +60,7 @@
 			
 			
 			if (hashed) {
-				history.pushState({i: 0});
+				history.pushState({i: 0}, '');
 				
 				$(window).bind("popstate", function(evt) {
 					var s = evt.originalEvent.state;
@@ -71,7 +71,7 @@
 			function doClick(el, i, e) {
 				api.seekTo(i);
 				e.preventDefault(); 
-				if (hashed) { history.pushState({i: i}); }
+				if (hashed) { history.pushState({i: i}, ''); }
 			}
 			
 			function els() {
diff --git a/test/scrollable/history.html b/test/scrollable/history.html
new file mode 100644
index 0000000..d4a6d9b
--- /dev/null
+++ b/test/scrollable/history.html
@@ -0,0 +1,84 @@
+
+<script src="../js/jquery-1.6.2.js"></script>
+<script src="../../src/scrollable/scrollable.js"></script>
+<script src="../../src/scrollable/scrollable.navigator.js"></script>
+<link rel='stylesheet' href='http://flowplayer.org/tools/css/tabs-flowplayer-v2.css'>
+
+<style type="text/css">
+  /* override the root element to enable scrolling */
+	#flowpanes {
+		position:relative;
+		overflow:hidden;
+		clear:both;
+	}
+
+	/* override single pane */
+	#flowpanes div {
+		float:left;
+		display:block;
+		width:670px;
+		font-size:14px;
+	}
+
+	/* our additional wrapper element for the items */
+	#flowpanes .items {
+		width:20000em;
+		position:absolute;
+		clear:both;
+		margin:0;
+		padding:0;
+	}
+
+	#flowpanes .less, #flowpanes .less a {
+		color:#999 !important;
+		font-size:11px;
+	}
+
+</style>
+
+<!-- tabs work as navigator for scrollable -->
+<ul id="flowtabs" class="navi">
+	<li><a id="t1" href="#story">The Story</a></li>
+	<li><a id="t2" href="#features">Features</a></li>
+	<li><a id="t3" href="#plugins">Plugins</a></li>
+	<li><a id="t4" href="#demos">Demos</a></li>
+</ul>
+
+<!-- tab panes -->
+<div id="flowpanes">
+
+	<!-- wrapper for scrollable items -->
+	<div class="items">
+
+		<!-- the items -->
+		<div> [ story html ]</div>
+		<div> [ features html ]</div>
+		<div> [ plugins html ]</div>
+		<div> [ demos html ]</div>
+
+	</div>
+
+</div>
+
+<script type="text/javascript">
+// wait until document is fully scriptable
+$(function() {
+
+	// select #flowplanes and make it scrollable. use circular and navigator plugins
+	$("#flowpanes").scrollable({ circular: true, mousewheel: true }).navigator({
+
+		// select #flowtabs to be used as navigator
+		navi: "#flowtabs",
+
+		// select A tags inside the navigator to work as items (not direct children)
+		naviItem: 'a',
+
+		// assign "current" class name for the active A tag inside navigator
+		activeClass: 'current',
+
+		// make browser's back button work
+		history: true
+
+	});
+});
+</script>
\ No newline at end of file