mirror of
				https://github.com/flynx/PortableMag.git
				synced 2025-10-31 12:00:11 +00:00 
			
		
		
		
	some refactoring...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									30083d52a2
								
							
						
					
					
						commit
						20a10ee3e4
					
				| @ -43,14 +43,6 @@ $(document).ready(function(){ | ||||
| 		// setup internal events... | ||||
| 		.on('pageChanged bookmarkAdded bookmarkRemoved bookmarksCleared', saveState) | ||||
| 		.on('pageChanged', updatePageNumberIndicator) | ||||
| 		.on('bookmarksCleared', clearBookmarkIndicators) | ||||
| 		.on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) | ||||
| 		.on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) | ||||
| 
 | ||||
| 		// editor specific events... | ||||
| 		.on('pageCreated articleCreated magazineCreated', resetNavigator) | ||||
| 		.on('pageMoved articleMoved', resetNavigator) | ||||
| 		.on('pageRemoved articleRemoved', resetNavigator) | ||||
| 
 | ||||
| 		// templates... | ||||
| 		.on('pageCreated articleCreated magazineCreated ' + | ||||
|  | ||||
| @ -42,9 +42,6 @@ $(document).ready(function(){ | ||||
| 		// setup internal events... | ||||
| 		.on('pageChanged bookmarkAdded bookmarkRemoved bookmarksCleared', saveState) | ||||
| 		.on('pageChanged', updatePageNumberIndicator) | ||||
| 		.on('bookmarksCleared', clearBookmarkIndicators) | ||||
| 		.on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) | ||||
| 		.on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) | ||||
| 
 | ||||
| 		// user interactions... | ||||
| 		.swipe({ | ||||
|  | ||||
							
								
								
									
										16
									
								
								navigator.js
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								navigator.js
									
									
									
									
									
								
							| @ -45,7 +45,7 @@ function clearArticleIndicators(){ | ||||
| } | ||||
| 	 | ||||
| 
 | ||||
| function setupNavigator(){ | ||||
| function setupNavigator(skip_events){ | ||||
| 	var bar = $('.navigator .bar') | ||||
| 	var elems = $('.navigator .indicator, .navigator .article') | ||||
| 	var pos = $('.navigator .indicator').fadeIn() | ||||
| @ -68,10 +68,21 @@ function setupNavigator(){ | ||||
| 		makeBookmarkIndicator($(e).parents('.page')) | ||||
| 	}) | ||||
| 	 | ||||
| 	if(!skip_events){ | ||||
| 		// setup event handlers...
 | ||||
| 		$('.viewer') | ||||
| 			// basic functions...
 | ||||
| 			.on('pageChanged', function(e, n){updateNavigator(n)}) | ||||
| 			.on('magazineDragging', function(){updateNavigator()}) | ||||
| 			// bookmarks...
 | ||||
| 			.on('bookmarksCleared', clearBookmarkIndicators) | ||||
| 			.on('bookmarkAdded', function(_, n){makeBookmarkIndicator(n)}) | ||||
| 			.on('bookmarkRemoved', function(_, n){removeBookmarkIndicator(n)}) | ||||
| 			// editor specific events...
 | ||||
| 			.on('pageCreated articleCreated magazineCreated', resetNavigator) | ||||
| 			.on('pageMoved articleMoved', resetNavigator) | ||||
| 			.on('pageRemoved articleRemoved', resetNavigator) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // XXX this needs to unbind events...
 | ||||
| @ -118,6 +129,9 @@ function updateNavigator(n){ | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| /******************************************************* bookmarks ***/ | ||||
| 
 | ||||
| function makeBookmarkIndicator(n){ | ||||
| 	if(n == null){ | ||||
| 		n = getPageNumber() | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user