Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/HttpPublic/EMWUI/js/common.js b/HttpPublic/EMWUI/js/common.js
- index 4ccc432..effad4f 100644
- --- a/HttpPublic/EMWUI/js/common.js
- +++ b/HttpPublic/EMWUI/js/common.js
- @@ -119,7 +119,7 @@ function delNotify(notify, data, noSnack){
- }
- //通知登録
- -var NotifySound = $('<audio src="' + path + 'video/notification.mp3">')[0];
- +var NotifySound = $('<audio src="' + root + 'video/notification.mp3">')[0];
- NotifySound.volume = 0.2;
- function creatNotify(notify, data, save){
- var notification = $('.mdl-js-snackbar').get(0);
- diff --git a/HttpPublic/EMWUI/recinfodesc.html b/HttpPublic/EMWUI/recinfodesc.html
- index 059345a..3363d95 100644
- --- a/HttpPublic/EMWUI/recinfodesc.html
- +++ b/HttpPublic/EMWUI/recinfodesc.html
- @@ -14,9 +14,9 @@ if v then
- -- トランスコード済みのファイルがvideoフォルダにあればそっち使う
- fname=string.match(w.recFilePath, '[^\\]*$') or ''
- for i,ext in ipairs({'.mp4','.webm'}) do
- - f=edcb.FindFile and edcb.FindFile(mg.script_name:gsub('[^\\/]*$','')..'video\\'..fname..ext, 1)
- + f=edcb.FindFile and edcb.FindFile(mg.document_root..'\\video\\'..fname..ext, 1)
- if f then
- - video='video/'..fname..ext
- + video=PathToRoot()..'video/'..fname..ext
- break
- end
- end
- @@ -60,7 +60,7 @@ if v then
- ..'</ul></section>'
- ..(video and '<section class="mdl-layout__tab-panel" id="movie">\n<div class="mdl-grid mdl-grid--no-spacing">\n'
- - ..player('<video id="video" '..(ori and 'preload="none" data-path="'..video..'" data-duration="'..v.durationSecond..'"' or 'src="'..video..'" data-public="true" data-load="true"')..' data-rec="true"></video>\n', not ori)
- + ..player('<video id="video" '..(ori and 'preload="none" data-path="'..video..'" data-duration="'..v.durationSecond..'"' or 'src="'..mg.url_encode(video):gsub('%%2f','/')..'" data-public="true" data-load="true"')..' data-rec="true"></video>\n', not ori)
- ..'</div>\n</section>\n' or '')
- ..(#v.errInfo>0 and '<section class="mdl-layout__tab-panel" id="error">\n<div>\n<pre>'..v.errInfo..'</pre>\n</div>\n</section>\n' or '')
- diff --git a/HttpPublic/EMWUI/util.lua b/HttpPublic/EMWUI/util.lua
- index d034579..2130c5f 100644
- --- a/HttpPublic/EMWUI/util.lua
- +++ b/HttpPublic/EMWUI/util.lua
- @@ -35,7 +35,7 @@ function template(temp)
- <script src="]=]..path..[=[js/jquery.hammer.js"></script>
- ]=]
- ..((temp.dialog or temp.progres) and '<script src="'..path..'js/dialog-polyfill.js"></script>\n' or '')
- -..'<script>path=\''..path..'\';root=\''..mg.script_name:gsub('[^\\/]*$',''):gsub(mg.document_root..'/',''):gsub('[^\\/]*[\\/]','../')..'\';</script>\n'
- +..'<script>path=\''..path..'\';root=\''..PathToRoot()..'\';</script>\n'
- ..'<script src="'..path..'js/common.js"></script>\n'
- -- javascript
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement