[Tynstep-svn] r266 - in trunk/step/step-web/src/main/webapp: . js

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2012-04-26 10:02:14 -0700 (Thu, 26 Apr 2012)
New Revision: 266

Modified:
   trunk/step/step-web/src/main/webapp/index.html
   trunk/step/step-web/src/main/webapp/js/bookmark.js
Log:
forcing open the history panel

Modified: trunk/step/step-web/src/main/webapp/index.html
===================================================================
--- trunk/step/step-web/src/main/webapp/index.html	2012-04-26 16:41:32 UTC (rev 265)
+++ trunk/step/step-web/src/main/webapp/index.html	2012-04-26 17:02:14 UTC (rev 266)
@@ -75,7 +75,7 @@
 			</div>
 			<div id="bookmarkPane" class="bookmarkPane ui-corner-all">
 				<h3 class="ui-helper-reset ui-state-default ui-corner-all">
-					<span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>History
+					<span class="leftBookmarkArrow ui-icon ui-icon-triangle-1-e"></span>Recent Texts
 				</h3>
 				<div id="historyDisplayPane" class="bookmarkContents"><br /></div>
 				<h3 id="bookmarkHeader" class="ui-helper-reset ui-state-default ui-corner-all">
@@ -147,7 +147,7 @@
 	</div>
 </div>
 
-<div id="goToDate">
+<div id="goToDate" style="display: none">
 	Please enter a year: <input type="text" id="scrollToYear" />
 </div>
 

Modified: trunk/step/step-web/src/main/webapp/js/bookmark.js
===================================================================
--- trunk/step/step-web/src/main/webapp/js/bookmark.js	2012-04-26 16:41:32 UTC (rev 265)
+++ trunk/step/step-web/src/main/webapp/js/bookmark.js	2012-04-26 17:02:14 UTC (rev 266)
@@ -24,8 +24,6 @@
 		self.mergeHistory(data);
 	});
 	
-	this.initialiseHistory();
-	
 	//add accordion handlers
 	$("#bookmarkPane h3").click(function() {
 		//toggle the arrow
@@ -43,6 +41,8 @@
 
 		$(this).next().slideToggle(250);
 	}).disableSelection().next().slideUp(0);
+
+	this.initialiseHistory();
 	
 	//finally, we add a handler to force login of the bookmarks
 	$("#bookmarkHeader").click(function() {
@@ -52,11 +52,12 @@
 		self.loadedBookmarks = false;
 		self.bookmarkContainer.html("");
 	});
+	
+	
 }
 
 //TODO make server setting
 Bookmark.maxBookmarks = 10;
-//TODO make server setting
 Bookmark.historyDelimiter = '~';
 
 //we need to ignore the first two passage changes since we have those in the history
@@ -124,6 +125,9 @@
 	//create the history from the cookie, or - logged-in event will override
 	var self = this;
 	self.createHistoryItemsFromCookies();
+	
+	//finally, we open the history tab
+	$("#bookmarkPane h3").trigger('click');
 };
 
 /**