Skip to content

Commit

Permalink
use svg-inline-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
DIYgod committed Feb 8, 2018
1 parent 0ae4511 commit df1deb3
Show file tree
Hide file tree
Showing 28 changed files with 169 additions and 155 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
"sass-loader": "^6.0.6",
"strip-loader": "^0.1.2",
"style-loader": "^0.20.1",
"svg-inline-loader": "0.8.0",
"template-string-optimize-loader": "^2.2.3",
"url-loader": "^0.6.2",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.11.1"
},
"dependencies": {
"balloon-css": "^0.5.0",
"object-assign": "4.1.1",
"promise-polyfill": "7.0.2"
}
}
3 changes: 3 additions & 0 deletions src/assets/camera.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/comment-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/comment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/full-web.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/assets/loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/pallette.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/send.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/setting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/subtitle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/volume-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/volume-off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/volume-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/css/bezel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
.diplayer-loading-dot {
animation: diplayer-loading-dot-fade .8s ease infinite;
opacity: 0;
fill: #fff;
transform-origin: 4px 4px;
@for $i from 7 through 1 {
&.diplayer-loading-dot-#{$i} {
Expand Down
10 changes: 10 additions & 0 deletions src/css/player.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
box-sizing: content-box;
}

svg {
width: 100%;
height: 100%;

path,
circle {
fill: #fff;
}
}

&:-webkit-full-screen {
width: 100%;
height: 100%;
Expand Down
3 changes: 2 additions & 1 deletion src/js/controller.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import utils from './utils';
import Thumbnails from './thumbnails';
import Icons from './icons';

class Controller {
constructor (player) {
Expand Down Expand Up @@ -180,7 +181,7 @@ class Controller {
}
else {
this.player.video.muted = true;
this.player.template.volumeIcon.innerHTML = this.player.icons.get('volume-off');
this.player.template.volumeIcon.innerHTML = Icons.volumeOff;
this.player.bar.set('volume', 0, 'width');
}
});
Expand Down
37 changes: 37 additions & 0 deletions src/js/icons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import play from '../assets/play.svg';
import pause from '../assets/pause.svg';
import volumeUp from '../assets/volume-up.svg';
import volumeDown from '../assets/volume-down.svg';
import volumeOff from '../assets/volume-off.svg';
import full from '../assets/full.svg';
import fullWeb from '../assets/full-web.svg';
import setting from '../assets/setting.svg';
import right from '../assets/right.svg';
import comment from '../assets/comment.svg';
import commentOff from '../assets/comment-off.svg';
import send from '../assets/send.svg';
import pallette from '../assets/pallette.svg';
import camera from '../assets/camera.svg';
import subtitle from '../assets/subtitle.svg';
import loading from '../assets/loading.svg';

const Icons = {
play: play,
pause: pause,
volumeUp: volumeUp,
volumeDown: volumeDown,
volumeOff: volumeOff,
full: full,
fullWeb: fullWeb,
setting: setting,
right: right,
comment: comment,
commentOff: commentOff,
send: send,
pallette: pallette,
camera: camera,
subtitle: subtitle,
loading: loading,
};

export default Icons;
Loading

0 comments on commit df1deb3

Please sign in to comment.