diff --git a/web/assets/js/bs5.cameraProbe.js b/web/assets/js/bs5.cameraProbe.js index 570dee7c..f1303db7 100644 --- a/web/assets/js/bs5.cameraProbe.js +++ b/web/assets/js/bs5.cameraProbe.js @@ -160,8 +160,7 @@ $(document).ready(function(e){ submit: function(url,show){ probeWindow.find('[name="url"]').val(url) probeForm.submit() - // if(show)probeWindow.modal('show') - alert('open Prober') + openTab('cameraProbe') }, } }) diff --git a/web/assets/js/bs5.dashboard-base.js b/web/assets/js/bs5.dashboard-base.js index 4182ed82..7baa8552 100644 --- a/web/assets/js/bs5.dashboard-base.js +++ b/web/assets/js/bs5.dashboard-base.js @@ -258,7 +258,7 @@ function compileConnectUrl(options){ if(options.port && options.port !== ''){ porty = ':' + options.port } - var url = options.protocol + '://' + options.host + porty + var url = options.protocol + '://' + options.host + porty + options.path return url } diff --git a/web/assets/js/bs5.monitorSettings.js b/web/assets/js/bs5.monitorSettings.js index a000caa9..f3a72a21 100644 --- a/web/assets/js/bs5.monitorSettings.js +++ b/web/assets/js/bs5.monitorSettings.js @@ -900,9 +900,9 @@ var buildMonitorURL = function(){ host: host, protocol: protocol, port: port, - path: path, + path: encodeURIComponent(path), type: type, - }) + path; + }); } return url } @@ -983,7 +983,7 @@ monitorEditorWindow.on('change','[channel-detail]',function(){ monitorStreamChannelsave() }) monitorEditorWindow.find('.probe-monitor-settings').click(function(){ - $.pB.submit(buildMonitorURL(),true) + $.pB.submit(buildMonitorURL()) }) monitorEditorWindow.find('.save_config').click(function(e){ //export monior config in view @@ -1467,8 +1467,10 @@ editorForm.find('[name="type"]').change(function(e){ monitorId = el.attr('data-mid') } openMonitorEditorPage(doNew === 'true' ? null : monitorId) - }) - + }); + monitorEditorWindow.find('.probe_config').click(function(){ + $.pB.submit(buildMonitorURL(),true) + }); mainSocket.on('f',function (d){ // new PNotify({ // title: lang['Settings Changed'],