Merge branch 'master' of https://github.com/dbFlower/CommentCoreLibrary

Author: Frezc

.gitignore

@@ -4,5 +4,10 @@
 
 # Ignore Node Modules
 /node_modules/*
+
+# Ignore CI
 /compiled_spec/*
 /coverage/*
+
+# Ignore tscache
+.tscache

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 sudo: false
 node_js:
-  - "0.10"
+  - "6.7.0"
 before_install:
-  - npm install npm@1.4 -g
+  - npm install npm -g
 before_script:
   - npm install -g grunt-cli
 script:

Gruntfile.coffee

@@ -44,28 +44,24 @@ module.exports = (grunt) ->
   CMP_CORE_TS = { }
   CMP_CORE_NAME = [ ]
   for target in SRC_CORE_CMP
-    CMP_CORE_NAME.push ("typescript:" + target)
+    CMP_CORE_NAME.push ("ts:" + target)
     CMP_CORE_TS[target] =
-      options:
-        target: 'es5'
-        basePath: 'src/core'
-      src:  "src/core/" + target + ".ts"
-      dest: "src/core/" + target + ".js"
+      src: ["src/core/" + target + ".ts"]
+      out: "src/core/" + target + ".js"
 
   # Dynamically generate the kagerou ts targets
   CMP_KAGEROU_TS = { }
   CMP_KAGEROU_NAME = [ ]
   for target,src of SRC_SCRIPTING_KAGEROU
-    CMP_KAGEROU_NAME.push ('typescript:kagerou_engine_' + target)
+    CMP_KAGEROU_NAME.push ('ts:kagerou_engine_' + target)
     CMP_KAGEROU_TS['kagerou_engine_' + target] =
-      options:
-        target: 'es5'
-        basePath: src.split('/')[0..-1].join('/')
       src: src
-      dest: 'build/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
+      out: 'build/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
 
   # Append Typescript Tasks
-  ts_config = {}
+  ts_config = 
+    options:
+      target: 'es5'
   for key,value of CMP_CORE_TS
     ts_config[key] = value
   for key,value of CMP_KAGEROU_TS
@@ -99,7 +95,7 @@ module.exports = (grunt) ->
           'build/CommentCoreLibrary.js': SRC_CORELIB
 
     # Compile TypeScript
-    typescript: ts_config
+    ts: ts_config
 
     # Copy
     copy:
@@ -169,8 +165,10 @@ module.exports = (grunt) ->
           specs: 'compiled_spec/*spec.js'
           helpers: 'spec/*helper.js'
           vendor: [
-            'node_modules/jasmine-jquery/vendor/jquery/jquery.js'
+            'node_modules/jquery/dist/jquery.js'
             'node_modules/jasmine-jquery/lib/jasmine-jquery.js'
+            'node_modules/sinon/pkg/sinon.js'
+            'node_modules/jasmine-sinon/lib/jasmine-sinon.js'
           ]
           template: require('grunt-template-jasmine-istanbul')
           templateOptions:
@@ -182,8 +180,10 @@ module.exports = (grunt) ->
           specs: 'compiled_spec/*spec.js'
           helpers: 'spec/*helper.js'
           vendor: [
-            'node_modules/jasmine-jquery/vendor/jquery/jquery.js'
+            'node_modules/jquery/dist/jquery.js'
             'node_modules/jasmine-jquery/lib/jasmine-jquery.js'
+            'node_modules/sinon/pkg/sinon.js'
+            'node_modules/jasmine-sinon/lib/jasmine-sinon.js'
           ]
           template: require('grunt-template-jasmine-istanbul')
           templateOptions:

README.md

@@ -16,7 +16,7 @@ inside their own projects (whether web based or not) are encouraged to learn
 from and extend from the CommentCoreLibrary.
 
 ## Testing
-We have a live demo [here](http://jabbany.github.com/CommentCoreLibrary/demo).
+We have a live demo [here](http://jabbany.github.io/CommentCoreLibrary/demo).
 Feel free to [open tickets](CONTRIBUTING.md) if this demo test has bugs.
 
 ## License
@@ -66,7 +66,7 @@ implementation of a video player with CommentCoreLibrary.
 高级弹幕效果 (5) 基础格式解析 (6) 代码弹幕支持。
 
 ## 测试
-你可以在[这里](http://jabbany.github.com/CommentCoreLibrary/demo) 访问到测试页面。
+你可以在[这里](http://jabbany.github.io/CommentCoreLibrary/demo) 访问到测试页面。
 我们欢迎各种[BUG报告](CONTRIBUTING.md)。
 
 ## 许可

bower.json

@@ -1,6 +1,6 @@
 {
   "name":    "comment-core-library",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "main":    ["build/CommentCoreLibrary.js","build/style.css"],
   "ignore":  [ 
   	"test/**/*",