more work on the editor...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

TODO.otl

@@ -1,11 +1,15 @@
-[_] 34% Priority work
+[_] 30% Priority work
 	[_] 0% TouchSwipe issues...
 		[_] BUG: swipe-back does not cancel a swipe... (TouchSwipe)
 		| ...unless the finger is return to within the threshold of the 
 		| touchdown point.
 		[_] BUG: no drag threshold on excludedElements (TouchSwipe)
 		| stalled...
-	[_] 80% general todo
+	[_] 12% general todo
+		[_] add min-width to magazine and article...
+		[_] add default empty state to viewer, magazine and article...
+		| use it to trigger a "New Magazine", "New Cover"/"New Article" and
+		| "New Cover"/"New Page" actions...
 		[_] add global credits and copyright page...
 		| list and link all the used software and authors...
 		[_] 25% add inline editor...
@@ -29,6 +33,7 @@
 		[_] 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...
+		[X] done
 			[X] do a better structure diagram...
 			[X] BUG: initial load on android does not center on the correct page...
 			| for some odd reason only one of the first and second pages are opened 
@@ -178,13 +183,13 @@
 			[_] 0% issue download
 				[_] whole edition dowload and update (primary mode)
 				[_] seporate issue download (secondary)
-	[_] 0% stage 4 - advanced features
+	[_] 46% stage 4 - editor and templating
-		[_] 0% edition editor / publisher
+		[_] % template engine
-			[_] create/delete edition
+		[_] 46% edition editor / publisher
-			[_] cover
+			[X] create/delete magazine
-			[_] 0% story
+			[X] cover
-				[_] add
+			[_] 33% article
-				| from template
+				[X] add
 				[_] delete
 				[_] move
 			[_] 0% page

editor.html

@@ -50,6 +50,7 @@ $(document).ready(function(){
 		// editor specific events...
 		.on('pageCreated articleCreated magazineCreated', resetNavigator)
 		.on('pageMoved articleMoved', resetNavigator)
+		.on('pageRemoved articleRemoved', resetNavigator)
 
 		// user interactions...
 		.swipe({

magazine.js

@@ -876,6 +876,59 @@ function resetState(){
 
 /********************************************************** editor ***/
 
+// basic constructors...
+function _createEmptyMagazine(title){
+	return $('<div/>')
+		.addClass('magazine')
+		.attr({
+			title: title
+		})
+}
+function _createMagazine(title, magazine_cover, article_cover){
+	if(magazine_cover == null){
+		magazine_cover = title
+	}
+	if(article_cover == null){
+		article_cover = 'Article'
+	}
+	return _createEmptyMagazine(title)
+		// a magazine by default has a cover...
+		.append(_createCoverPage(magazine_cover))
+		.append(_createArticle(article_cover))
+}
+// XXX do we need a title here???
+function _createEmptyArticle(){
+	return $('<div/>')
+		.addClass('article')
+}
+function _createArticle(template){
+	return _createEmptyArticle()
+		.append(_createCoverPage(template))
+}
+function _createPage(template){
+	return $('<div/>')
+		.addClass('page')
+		.append($('<div/>')
+				.addClass('content')
+				.text(template))
+}
+function _createCoverPage(template){
+	return _createPage(template).addClass('cover')
+}
+
+
+// XXX create magazine...
+// 		- magazine
+// 		- cover
+// 		- article
+// 			- cover
+function createMagazine(title, cover, article){
+	clearMagazine()
+	var mag = _createMagazine(title, cover, article).appendTo($('.aligner'))
+	setCurrentPage()
+	setupNavigator()
+	return mag
+}
 // XXX some things get really surprized when this is called, make things 
 // 		work with the mag cleared...
 function clearMagazine(){
@@ -884,31 +937,52 @@ function clearMagazine(){
 	clearNavigator()
 }
 
-// XXX create magazine...
-// 		- magazine
-// 		- cover
-function createMagazine(){
-	// XXX
-}
 
 
 // XXX create article (magazine, title, position)...
 // 		- article
 // 		- cover
 function createArticleBefore(article, title){
+	if(article == null){
+		article = $('.current.page').parents('.article')
+	}
 	// XXX
 }
 function createArticleAfter(article, title){
+	if(article == null){
+		article = $('.current.page').parents('.article')
+	}
 	// XXX
 }
+function removeArticle(article){
+	// XXX
+	$('.viewer').trigger('articleRemoved', res)
+}
+function shiftArticleLeft(article){
+	// XXX
+	$('.viewer').trigger('articleMoved', res)
+}
+function shiftArticleRight(article){
+	// XXX
+	$('.viewer').trigger('articleMoved', res)
+}
 
 
 // XXX create page (article, template, position)...
 // 		- page
 // 		- content
 function createPageIn(article, template){
-	// XXX
+	if(article == null){
+		article = $('.current.page').parents('.article')
+	}
+	// no article
+	if(article.length == 0){
+		return
+	}
+	var res = _createPage(template).appendTo(article)
 	$('.viewer').trigger('pageCreated', res)
+
+	return res
 }
 // XXX the next two are almost identical...
 // XXX prevent this from working outside of an article....
@@ -917,12 +991,7 @@ function createPageAfter(page, template){
 		page = $('.current.page')
 	}
 
-	var res = $('<div/>')
+	var res = _createPage(template).insertAfter(page)
-		.addClass('page')
-		.append($('<div/>')
-				.addClass('content')
-				.text('Page'))
-		.insertAfter(page)
 
 	$('.viewer').trigger('pageCreated', res)
 
@@ -934,19 +1003,36 @@ function createPageBefore(page, template){
 		page = $('.current.page')
 	}
 
-	var res = $('<div/>')
+	var res = _createPage(template).insertBefore(page)
-		.addClass('page')
-		.append($('<div/>')
-				.addClass('content')
-				.text('Page'))
-		.insertBefore(page)
 
 	$('.viewer').trigger('pageCreated', res)
 
 	return res
 }
+function removePage(page){
+	if(page == null){
+		page = $('.current.page')
+	}
+
+	var cur = getPageNumber()
+	page.remove()
+	setCurrentPage(cur)
+
+	$('.viewer').trigger('pageRemoved', page)
+
+	return page
+}
+
+// XXX should this move to before or after???
+function movePageTo(page, position){
+	// XXX
+	$('.viewer').trigger('pageMoved', page)
+	return page
+}
 // XXX make this push pages between articles...
-function pushPageLeft(page){
+// 		or should it be a seporate method...
+// XXX should this contain a number of steps?
+function shiftPageLeft(page){
 	if(page == null){
 		page = $('.current.page')
 	}
@@ -964,7 +1050,9 @@ function pushPageLeft(page){
 	return page
 }
 // XXX make this push pages between articles...
-function pushPageRight(page){
+// 		or should it be a seporate method...
+// XXX should this contain a number of steps?
+function shiftPageRight(page){
 	if(page == null){
 		page = $('.current.page')
 	}