diff --git a/README.md b/README.md index c31c3f7..21e9dbc 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ - [x] Web Audio API - [x] Setup Package - [x] Close Window +- [x] Function Key - [ ] Background image - [ ] Auto Render - [ ] Export Video diff --git a/img/e10.jpg b/img/e10.jpg deleted file mode 100644 index 4a7680d..0000000 Binary files a/img/e10.jpg and /dev/null differ diff --git a/img/e9.jpg b/img/e9.jpg deleted file mode 100644 index 267adc8..0000000 Binary files a/img/e9.jpg and /dev/null differ diff --git a/img/help.png b/img/help.png index 399446b..3d02560 100644 Binary files a/img/help.png and b/img/help.png differ diff --git a/index.html b/index.html index 5c3a7f6..7e9d89d 100644 --- a/index.html +++ b/index.html @@ -18,9 +18,9 @@ - + -

Please drag your music files here

+

Please drag or open your music files here

Play List
@@ -41,21 +41,44 @@

Please drag your music files here

Help
- -
-
+
+
+
+
+ \ No newline at end of file diff --git a/js/main.js b/js/main.js index 3244fde..8abeb31 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ // 主程序 -require(['util', 'effect'], function(util, effect) { +require(['util', 'effect'], function (util, effect) { var $body = $('body'), $fileList = $('#file-list'), @@ -179,7 +179,7 @@ require(['util', 'effect'], function(util, effect) { currentFile = num; loadFile(fileList[currentFile]); - $fileList.find('li').each(function() { + $fileList.find('li').each(function () { if (+$(this).attr('num') == num) { $(this).addClass('playing'); var songName = $(this).text(); @@ -198,45 +198,45 @@ require(['util', 'effect'], function(util, effect) { audio.pause(); } - $body.on('click', '#help-btn', function() { + $body.on('click', '#help-btn', function () { // 帮助渐隐渐入 $('#help').fadeIn('fast'); var $img = $('#help img').first(), src = $img.attr('data-src'); $img.attr('src', src); - }).on('click', '#help', function() { + }).on('click', '#help', function () { $(this).fadeOut('fast'); - }).on('click', '#title', function() { + }).on('click', '#title', function () { // 打开文件 $inputFile.click(); - title.style.display="none"; - }).on('click', '#play-mode', function() { + title.style.display = "none"; + }).on('click', '#play-mode', function () { // 改变播放模式 changePlayMode(); - }).on('click', '#fullscreen', function() { + }).on('click', '#fullscreen', function () { // 全屏切换 util.fullscreenSwitch(); - }).on('click', '#add-file', function() { + }).on('click', '#add-file', function () { // 打开文件 $inputFile.click(); }); // 文件拖曳 - doc.addEventListener('drop', function(e) { + doc.addEventListener('drop', function (e) { onDocumentDrop(e); }, false); doc.addEventListener("dragenter", dragAndDropCommon, false); doc.addEventListener("dragexit", dragAndDropCommon, false); doc.addEventListener("dragover", dragAndDropCommon, false); - audio.addEventListener('ended', function() { + audio.addEventListener('ended', function () { onMusicEnded(); }, false); - $body.on('click', '#file-list li', function() { + $body.on('click', '#file-list li', function () { var songNum = $(this).attr('num'); playSpecify(+songNum); - }).on('contextmenu', function(e) { + }).on('contextmenu', function (e) { e.preventDefault(); if ($fileListWrapper.css('left') != '0px') { $fileListWrapper.css({ 'left': '0' }); @@ -247,7 +247,7 @@ require(['util', 'effect'], function(util, effect) { } }); - doc.addEventListener('keydown', function(e) { + doc.addEventListener('keydown', function (e) { switch (e.keyCode) { case 32: // 空格 playToggle(); @@ -267,11 +267,11 @@ require(['util', 'effect'], function(util, effect) { } }, false); - $(window).on('beforeunload', function() { + $(window).on('beforeunload', function () { saveSetting(); }); - $inputFile.on('change', function(e) { + $inputFile.on('change', function (e) { appendFiles(inputFile.files); }); diff --git a/main.js b/main.js index 258eaec..7ecf9b4 100644 --- a/main.js +++ b/main.js @@ -17,7 +17,7 @@ function createWindow() { // and load the index.html of the app. mainWindow.loadFile('index.html') // Open the DevTools. - // mainWindow.webContents.openDevTools() + mainWindow.webContents.openDevTools() // Emitted when the window is closed. mainWindow.on('closed', function () { diff --git a/package.json b/package.json index 75701c5..8ea1dfa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "promotion-video-producer", - "version": "0.0.3", + "version": "0.0.4", "description": "Promotion Video Producer(a.k.a PVMaker & PV制作器) Is a software that generates music MV for Vocaloid like art work", "main": "main.js", "dependencies": {