Update events

Author: fchasen

reader/index.html

@@ -21,10 +21,6 @@
 
             document.onreadystatechange = function () {
               if (document.readyState == "complete") {
-                EPUBJS.filePath = "js/libs/";
-                EPUBJS.cssPath = window.location.href.replace(window.location.hash, '').replace('index.html', '') + "css/";
-                // fileStorage.filePath = EPUBJS.filePath;
-
                 window.reader = ePubReader("http://s3.amazonaws.com/moby-dick/");
               }
             };
@@ -40,9 +36,6 @@
         <!-- Render -->
         <script src="js/epub.js"></script>
 
-        <!-- Hooks -->
-        <!-- <script src="js/hooks.min.js"></script> -->
-
         <!-- Reader -->
         <script src="js/reader.js"></script>
 

reader/js/reader.js

@@ -23,20 +23,20 @@ if (!argv.p) {
 function listen(port) {
 	var server = connect();
 		server.use(connect.static(__dirname))
-		
+
 		if(!logger) server.use(connect.logger(logger))
-		
+
 		server.listen(port);
-	
+
 	log('Starting up Server, serving '.yellow
 		+ __dirname.green
 		+ ' on port: '.yellow
 		+ port.toString().cyan);
 	log('Hit CTRL-C to stop the server');
-	
+
 }
-	 
-	
+
+
 
 process.on('SIGINT', function () {
 	log('http-server stopped.'.red);

reader/js/reader.js.map

@@ -11,7 +11,7 @@ EPUBJS.reader.ControlsController = function(book) {
 			$sidebar = $("#sidebar"),
 			$settings = $("#setting"),
 			$bookmark = $("#bookmark");
-
+	/*
 	var goOnline = function() {
 		reader.offline = false;
 		// $store.attr("src", $icon.data("save"));
@@ -26,7 +26,7 @@ EPUBJS.reader.ControlsController = function(book) {
 
 	book.on("book:online", goOnline);
 	book.on("book:offline", goOffline);
-
+	*/
 	$slider.on("click", function () {
 		if(reader.sidebarOpen) {
 			reader.SidebarController.hide();
@@ -106,10 +106,6 @@ EPUBJS.reader.ControlsController = function(book) {
 		}
 	});
 
-	book.on('book:pageChanged', function(location){
-		// console.log("page", location.page, location.percentage)
-	});
-
 	return {
 
 	};

reader/js/reader.min.js

@@ -76,7 +76,7 @@ EPUBJS.reader.NotesController = function() {
 		$anchor.text("Attach");
 		$text.prop("disabled", false);
 
-		book.off("renderer:click", insertAtPoint);
+		rendition.off("click", insertAtPoint);
 
 	};
 
@@ -159,8 +159,8 @@ EPUBJS.reader.NotesController = function() {
 				popups[id].addEventListener("mouseout", offPop, false);
 
 				//-- Add hide on page change
-				renderer.on("renderer:locationChanged", hidePop, this);
-				renderer.on("renderer:locationChanged", offPop, this);
+				rendition.on("locationChanged", hidePop, this);
+				rendition.on("locationChanged", offPop, this);
 				// chapter.book.on("renderer:chapterDestroy", hidePop, this);
 			}
 
@@ -256,7 +256,7 @@ EPUBJS.reader.NotesController = function() {
 		$anchor.text("Cancel");
 		$text.prop("disabled", "true");
 		// listen for selection
-		book.on("renderer:click", insertAtPoint);
+		rendition.on("click", insertAtPoint);
 
 	});
 

server.js

@@ -12,7 +12,7 @@ EPUBJS.reader.ReaderController = function(book) {
 		if (reader.settings.sidebarReflow){
 			$main.removeClass('single');
 			$main.one("transitionend", function(){
-				rendition.display(currentPosition);
+				rendition.resize();
 			});
 		} else {
 			$main.removeClass("closed");
@@ -28,7 +28,7 @@ EPUBJS.reader.ReaderController = function(book) {
 		if (reader.settings.sidebarReflow){
 			$main.addClass('single');
 			$main.one("transitionend", function(){
-				rendition.display(currentPosition);
+				rendition.resize();
 			});
 		} else {
 			$main.addClass("closed");
@@ -122,21 +122,22 @@ EPUBJS.reader.ReaderController = function(book) {
 		e.preventDefault();
 	});
 
-	book.on("renderer:spreads", function(bool){
-		if(bool) {
+	rendition.on("layout", function(props){
+		if(props.spread === true) {
 			showDivider();
 		} else {
 			hideDivider();
 		}
 	});
 
-	// book.on("book:atStart", function(){
-	// 	$prev.addClass("disabled");
-	// });
-	//
-	// book.on("book:atEnd", function(){
-	// 	$next.addClass("disabled");
-	// });
+	rendition.on('relocated', function(location){
+		if (location.atStart) {
+			$prev.addClass("disabled");
+		}
+		if (location.atEnd) {
+			$next.addClass("disabled");
+		}
+	});
 
 	return {
 		"slideOut" : slideOut,

src/controllers/controls_controller.js

@@ -124,10 +124,10 @@ EPUBJS.Reader = function(bookPath, _options) {
 
 	document.addEventListener('keydown', this.adjustFontSize.bind(this), false);
 
-	book.on("renderer:keydown", this.adjustFontSize.bind(this));
-	book.on("renderer:keydown", reader.ReaderController.arrowKeys.bind(this));
+	rendition.on("keydown", this.adjustFontSize.bind(this));
+	rendition.on("keydown", reader.ReaderController.arrowKeys.bind(this));
 
-	book.on("renderer:selected", this.selectedRange.bind(this));
+	rendition.on("selected", this.selectedRange.bind(this));
 
 	return this;
 };