Merge pull request #117 from yjlintw/pre-v2

Pre v2

package.json

@@ -2,8 +2,8 @@
   "name": "comic-reader",
   "productName": "Comic Reader",
   "author": "Team Comic Reader",
-  "version": "0.1.46",
-  "description": "Quickly, smoothly and cooler reading experience. The best move to read comics.",
+  "version": "0.1.47",
+  "description": "A quicker, smoother and cooler reading experience. The best way to read comics.",
   "main": "main.js",
   "devDependencies": {
     "concurrently": "^3.4.0",

renderer-process/components/titlebar.js

@@ -1,13 +1,11 @@
 var events = require('events');
 var util = require('util');
 var fs = require('fs');
-// var domify = require('domify');
-// var $ = require("dombo");
 
 var $window = $(window);
 var html_mac = fs.readFileSync(__dirname + '/../../sections/titlebar-mac.html', 'utf-8');
 var html_win = fs.readFileSync(__dirname + '/../../sections/titlebar-win.html', 'utf-8');
-// console.log(html);
+
 var TitleBar = function(options) {
     if (!(this instanceof TitleBar)) return new TitleBar(options);
     events.EventEmitter.call(this);
@@ -19,6 +17,7 @@ var TitleBar = function(options) {
     var $element = $(html);
     var element = $element[0];
     this.element = element;
+	this.$element = $element;
 
     var self = this;
 	var close = $('.titlebar-close', element)[0];
@@ -53,7 +52,6 @@ TitleBar.prototype.appendTo = function(target) {
 	if(typeof target === 'string') target = $(target)[0];
 
 	var $element = this.$element;
-
 	$window.on('keydown', this._onkeydown = function(e) {
 
 		if(e.keyCode === 18) {
@@ -64,7 +62,6 @@ TitleBar.prototype.appendTo = function(target) {
 	$window.on('keyup', this._onkeyup = function(e) {
 		if(e.keyCode === 18) $element.removeClass('alt');
 	});
-	// console.log(typeof this.element)
 	target.appendChild(this.element);
 	return this;
 };

renderer-process/content-loader.js

@@ -13,18 +13,4 @@ $.get('./sections/read-view.html', function(result) {
 
 $.get('./sections/about-view.html', function(result) {
     $("#main-view").append(result);
-})
-
-// $.get('./sections/page.html', function(result) {
-//     for(var i = 0; i < 50; i++) {
-//         var view = $(result);
-//         view.find("img").attr("src", "./assets/img/test/80x100.png")
-//         $("#read-area").append(view);
-//     }
-
-// })
-
-// tmp.load('./sections/search-view.html');
-// $("#main-view").append(tmp.find("loader").html());
-// tmp.load('./sections/read-view.html');
-// $("#main-view").append(tmp.find("loader").html());
+})

renderer-process/load-after.js

@@ -3,18 +3,18 @@
  */
 // const path = require('path');
 // 3rd party library
-var schedule = require('node-schedule');
+let schedule = require('node-schedule');
 
 // viewmodel
-var subscriber = require('./viewmodels/subscribe-viewmodel');
+let subscriber = require('./viewmodels/subscribe-viewmodel');
 
 // viewcontroller
-var viewswitch_viewcontroller = require('./viewcontrollers/view-switch-viewcontroller');
+let viewswitch_viewcontroller = require('./viewcontrollers/view-switch-viewcontroller');
 const isDev = require('electron-is-dev');
 
-var scheduledTask;
+let scheduledTask;
 $(document).ready(function() {
-    console.log(viewswitch_viewcontroller)
+    // console.log(viewswitch_viewcontroller)
     if (subscriber.hasSubscription()) {
         viewswitch_viewcontroller.tabswitch(viewswitch_viewcontroller.TAB_NAME.FAVORITE);
     } else {