Skip to content

Commit

Permalink
Append bower support
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhiguo Zhang committed Jan 9, 2016
1 parent bfa7d4b commit 125bdfb
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ webpack.json
toneden.js
toneden.loader.js
.idea
dist
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ module.exports = function(grunt) {
build: {
entry: './loader/index.js',
output: {
chunkFilename: 'toneden.js',
chunkFilename: 'dist/toneden.js',
crossOriginLoading: 'anonymous',
filename: 'toneden.loader.js',
filename: 'dist/toneden.loader.js',
library: 'ToneDenSDK'
},
module: {
Expand All @@ -153,7 +153,7 @@ module.exports = function(grunt) {
test: /\.jsx$/
}, {
loader: 'url-loader?limit=8192',
test: /\.(png|jpg)$/
test: /\.(png|jpg|woff|woff2|eot|ttf|svg)$/
}]
},
plugins: webpackPlugins,
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ToneDen",
"name": "tone-den",
"version": "2.0.1",
"homepage": "https://github.com/ZhiguoZhang/toneden-sdk",
"authors": [
Expand Down
4 changes: 2 additions & 2 deletions loader/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ if(typeof window !== 'undefined') {
if(env === 'local' || window.location.host === 'publisher.dev' || window.location.host === 'lvho.st') {
__webpack_public_path__ = '//widget.dev/';
} else if(env === 'production') {
__webpack_public_path__ = '//sd.toneden.io/production/v2/';
__webpack_public_path__ = 'dist/';
} else if(env === 'staging') {
__webpack_public_path__ = '//sd.toneden.io/dev/v2/';
__webpack_public_path__ = 'dist/';
}

require.ensure(['../sdk/js/index'], function(ToneDen) {
Expand Down
8 changes: 4 additions & 4 deletions sdk/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'td-player';
src:
url('//sd.toneden.io/resources/fonts/td-player.woff') format('woff'),
url('//sd.toneden.io/resources/fonts/td-player.eot') format('embedded-opentype'),
url('//sd.toneden.io/resources/fonts/td-player.ttf') format('truetype'),
url('//sd.toneden.io/resources/fonts/td-player.svg') format('svg');
url('../fonts/td-player.woff') format('woff'),
url('../fonts/td-player.eot') format('embedded-opentype'),
url('../fonts/td-player.ttf') format('truetype'),
url('../fonts/td-player.svg') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
Binary file added sdk/fonts/td-player.eot
Binary file not shown.
29 changes: 29 additions & 0 deletions sdk/fonts/td-player.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sdk/fonts/td-player.ttf
Binary file not shown.
Binary file added sdk/fonts/td-player.woff
Binary file not shown.

0 comments on commit 125bdfb

Please sign in to comment.