futurepress
diff --git a/‎Gruntfile.js
+5-4 b/‎Gruntfile.js
+5-4
diff --git a/‎package-lock.json
+167-15 b/‎package-lock.json
+167-15
diff --git a/‎package.json
+2-2 b/‎package.json
+2-2
diff --git a/‎reader/index.html
+5-12 b/‎reader/index.html
+5-12
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
 					'sourceRoot': '../'
 				},
       	files: {
-					'reader/js/reader.js': ['<banner>', 'src/reader.js', 'src/controllers/*.js'],
+					'reader/js/reader.js': ['<banner>', 'node_modules/rsvp/dist/rsvp.js', 'src/core.js',  'src/reader.js', 'src/controllers/*.js'],
 				}
 			}
 		},
@@ -24,7 +24,7 @@ module.exports = function(grunt) {
 						sourceMap: false
 				},
 				files: {
-					'reader/js/reader.min.js': ['<banner>', 'src/reader.js', 'src/controllers/*.js'],
+					'reader/js/reader.min.js': ['<banner>', 'node_modules/rsvp/dist/rsvp.js', 'src/core.js', 'src/reader.js', 'src/controllers/*.js'],
 				}
 			}
 		},
@@ -38,8 +38,9 @@ module.exports = function(grunt) {
 					{src: 'src/plugins/search.js', dest: 'reader/js/plugins/search.js'},
 					{src: 'src/plugins/hypothesis.js', dest: 'reader/js/plugins/hypothesis.js'},
 					{src: 'hooks/extensions/highlight.js', dest: 'reader/js/hooks/extensions/highlight.js'},
-					{src: 'node_modules/epubjs/build/epub.min.js', dest: 'reader/js/epub.min.js'},
-					{src: 'node_modules/epubjs/build/hooks.min.js', dest: 'reader/js/hooks.min.js'}
+					{src: 'node_modules/epubjs/dist/epub.min.js', dest: 'reader/js/epub.min.js'},
+					{src: 'node_modules/epubjs/dist/epub.js', dest: 'reader/js/epub.js'},
+					// {src: 'node_modules/epubjs/build/hooks.min.js', dest: 'reader/js/hooks.min.js'}
 				]
 			},
 		},
 
@@ -27,11 +27,11 @@
     "portfinder": "~0.2.1"
   },
   "dependencies": {
+    "epubjs": "^0.3.57",
     "jquery": "^2.1.4",
     "jszip": "^2.5.0",
     "localforage": "^1.2.10",
     "rsvp": "^3.1.0",
-    "screenfull": "^2.0.0",
-    "epubjs": "0.2.20"
+    "screenfull": "^2.0.0"
   }
 }
@@ -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/");
               }
             };
@@ -38,13 +34,10 @@
         <script src="js/libs/screenfull.min.js"></script>
 
         <!-- Render -->
-        <script src="js/epub.min.js"></script>
-
-        <!-- Hooks -->
-        <script src="js/hooks.min.js"></script>
+        <script src="js/epub.js"></script>
 
         <!-- Reader -->
-        <script src="js/reader.min.js"></script>
+        <script src="js/reader.js"></script>
 
         <!-- Plugins -->
         <!-- <script src="js/plugins/search.js"></script> -->
@@ -57,12 +50,12 @@
     <body>
       <div id="sidebar">
         <div id="panels">
-          <input id="searchBox" placeholder="search" type="search">
+          <!-- <input id="searchBox" placeholder="search" type="search"> -->
 
-          <a id="show-Search" class="show_view icon-search" data-view="Search">Search</a>
+          <!-- <a id="show-Search" class="show_view icon-search" data-view="Search">Search</a> -->
           <a id="show-Toc" class="show_view icon-list-1 active" data-view="Toc">TOC</a>
           <a id="show-Bookmarks" class="show_view icon-bookmark" data-view="Bookmarks">Bookmarks</a>
-          <a id="show-Notes" class="show_view icon-edit" data-view="Notes">Notes</a>
+          <!-- <a id="show-Notes" class="show_view icon-edit" data-view="Notes">Notes</a> -->
 
         </div>
         <div id="tocView" class="view">
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = function(grunt) {`
`13`	`13`	`'sourceRoot': '../'`
`14`	`14`	`},`
`15`	`15`	`files: {`
`16`		`- 'reader/js/reader.js': ['<banner>', 'src/reader.js', 'src/controllers/*.js'],`
	`16`	`+ 'reader/js/reader.js': ['<banner>', 'node_modules/rsvp/dist/rsvp.js', 'src/core.js', 'src/reader.js', 'src/controllers/*.js'],`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`},`
`@@ -24,7 +24,7 @@ module.exports = function(grunt) {`
`24`	`24`	`sourceMap: false`
`25`	`25`	`},`
`26`	`26`	`files: {`
`27`		`- 'reader/js/reader.min.js': ['<banner>', 'src/reader.js', 'src/controllers/*.js'],`
	`27`	`+ 'reader/js/reader.min.js': ['<banner>', 'node_modules/rsvp/dist/rsvp.js', 'src/core.js', 'src/reader.js', 'src/controllers/*.js'],`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`},`
`@@ -38,8 +38,9 @@ module.exports = function(grunt) {`
`38`	`38`	`{src: 'src/plugins/search.js', dest: 'reader/js/plugins/search.js'},`
`39`	`39`	`{src: 'src/plugins/hypothesis.js', dest: 'reader/js/plugins/hypothesis.js'},`
`40`	`40`	`{src: 'hooks/extensions/highlight.js', dest: 'reader/js/hooks/extensions/highlight.js'},`
`41`		`- {src: 'node_modules/epubjs/build/epub.min.js', dest: 'reader/js/epub.min.js'},`
`42`		`- {src: 'node_modules/epubjs/build/hooks.min.js', dest: 'reader/js/hooks.min.js'}`
	`41`	`+ {src: 'node_modules/epubjs/dist/epub.min.js', dest: 'reader/js/epub.min.js'},`
	`42`	`+ {src: 'node_modules/epubjs/dist/epub.js', dest: 'reader/js/epub.js'},`
	`43`	`+ // {src: 'node_modules/epubjs/build/hooks.min.js', dest: 'reader/js/hooks.min.js'}`
`43`	`44`	`]`
`44`	`45`	`},`
`45`	`46`	`},`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@`
`27`	`27`	`"portfinder": "~0.2.1"`
`28`	`28`	`},`
`29`	`29`	`"dependencies": {`
	`30`	`+ "epubjs": "^0.3.57",`
`30`	`31`	`"jquery": "^2.1.4",`
`31`	`32`	`"jszip": "^2.5.0",`
`32`	`33`	`"localforage": "^1.2.10",`
`33`	`34`	`"rsvp": "^3.1.0",`
`34`		`- "screenfull": "^2.0.0",`
`35`		`- "epubjs": "0.2.20"`
	`35`	`+ "screenfull": "^2.0.0"`
`36`	`36`	`}`
`37`	`37`	`}`