From e649f0c38482e3eb964925da6e27c85a5912da55 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Tue, 5 Feb 2013 20:59:15 +0400
Subject: [PATCH] some cleanup and refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 TODO.otl    | 16 ++++++++--------
 editor.html | 18 ++++++++++++------
 magazine.js |  8 +++++++-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/TODO.otl b/TODO.otl
index cb726b6..ee0fc1b 100755
--- a/TODO.otl
+++ b/TODO.otl
@@ -6,20 +6,17 @@
 		[_] BUG: no drag threshold on excludedElements (TouchSwipe)
 		| stalled...
 	[_] 67% general todo
-		[_] add separate history manager...
-		| might be a virtual history rather than browser history which 
-		| tends to slow things down -- just a simple stack...
 		[_] move some of the current configuration options to the magazine...
 		| same idea as .no-resize class...
 		[_] add option to align page to right or left screen border
 		| now only centering is possible...
 		[_] add transition-duration editors to config page (a-la PAGES_IN_RIBBON)...
 		| will help tuning the system,,,
-		[_] add toggleEditiorMode to all editable in all versions...
+		[_] Editor: add toggleEditiorMode to all editables in all versions...
 		| text areas, inputs, ...
-		[_] Try using scroll instead of left of .magazine....
+		[_] EXPERIMENT: Try using scroll instead of left of .magazine....
 		| this might improve speed...
-		[_] BUG: as on android before, on loading from json view does not reach cur page...
+		[_] BUG: as on android, on loading from json view does not reach cur page...
 		| likely due to animation/transition stopping for some reason....
 		[_] 0% add two main page themes (global/local applicable):
 			[_] light
@@ -64,15 +61,18 @@
 			[_] template photo page
 			[_] template 3x3 grid
 			[_] template two column text
+		[_] add separate history manager...
+		| might be a virtual history rather than browser history which 
+		| tends to slow things down -- just a simple stack...
 		[_] make layer default state configurable...
 		| e.g. setting "shown"/"hidden" classes in HTML and adding 
 		| something like a page reset that will restore the default state,
 		| rather than the current "hideLayers"
+		[_] BUG: when #URL updates are off layer toggling breaks...
+		| will show but not hide layers...
 		[_] BUG: href to existing anchors will mess up layout...
 		| need to find out how can we disable anchor links from actually
 		| going to the anchor...
-		[_] BUG: when #URL updates are off layer toggling breaks...
-		| will show but not hide layers...
 		[X] make #URL updates optional...
 		[X] add click current page to full page view...
 		[X] 100% templates
diff --git a/editor.html b/editor.html
index c5b6ee5..41c03c7 100755
--- a/editor.html
+++ b/editor.html
@@ -7,18 +7,24 @@
 <link rel="stylesheet" href="magazine.css">
 <link rel="stylesheet" href="magazine-custom.css">
 
-<script src="jquery.js"></script>
-<script src="jquery.touchSwipe.js"></script>
-<script src="jstorage.js"></script>
-<!-- XXX make this optional... -->
-<script src="ckeditor/ckeditor.js"></script>
+<script src="ext-lib/jquery.js"></script>
+<script src="ext-lib/jquery.touchSwipe.js"></script>
+<script src="ext-lib/jstorage.js"></script>
+<!-- EXPERIMENTAL -->
+<!-- 
+XXX scrollTo is a cool and a powerfull tool but it needs a sustantial code reorganization 
+	this might be a good idea/exersize sometime in the future...
+-->
+<!--script src="ext-lib/jquery.scrollto.js"></script-->
+
+<script src="lib/jli.js"></script>
 
-<script src="jli.js"></script>
 <script src="magazine.js"></script>
 <script src="navigator.js"></script>
 <script src="editor.js"></script>
 
 <!-- configuration, keep this last... -->
+<script src="platform.js"></script>
 <script src="keybindings.js"></script>
 <script src="config.js"></script>
 
diff --git a/magazine.js b/magazine.js
index 1cae4d2..0ad026f 100755
--- a/magazine.js
+++ b/magazine.js
@@ -38,7 +38,7 @@ var UPDATE_HASH_URL_POSITION = false
 // of weather UPDATE_HASH_URL_POSITION state.
 // NOTE: UPDATE_HASH_URL_POSITION implicitly enables full browser history
 // 		based navigation.
-// NOTE: this can slow down navigation...
+// NOTE: this, if enabled, can slow down navigation...
 // NOTE: partial history navigation over links will still work.
 var FULL_HISTORY_ENABLED = false
 
@@ -723,6 +723,12 @@ function saveURLState(){
 	} else if(FULL_HISTORY_ENABLED){
 		// XXX add option to disable history altogether...
 		window.history.pushState(null, null, '#' + n)
+	} else {
+		// clear the url if it does not match the current page...
+		// XXX should this be here?
+		if(n != parseInt(anchor)){
+			window.location.hash = ''
+		}
 	}
 	return n
 }