From f011de6fb99433bc9da22b5634a68de3d7be55d1 Mon Sep 17 00:00:00 2001 From: cat Date: Thu, 9 Apr 2015 14:51:07 +0200 Subject: [PATCH 1/3] LSP - fixed repeat passwd focus bug --- lsp/mist.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lsp/mist.js b/lsp/mist.js index f664d9d5..4502f940 100644 --- a/lsp/mist.js +++ b/lsp/mist.js @@ -327,7 +327,7 @@ var UI = { var error = false; $ic.find('.hasValidate').each(function(){ var vf = $(this).data('validate'); - error = vf(this); + error = vf(this,true); //focus the field if validation failed if (error) { return false; //break loop } @@ -822,7 +822,7 @@ var UI = { } fs.push(f); } - $field.data('validate_functions',fs).data('help_container',$ihc).data('validate',function(me){ + $field.data('validate_functions',fs).data('help_container',$ihc).data('validate',function(me,focusonerror){ var val = $(me).getval(); var fs = $(me).data('validate_functions'); var $ihc = $(me).data('help_container'); @@ -835,7 +835,7 @@ var UI = { $err.addClass(error.classes[j]); } $ihc.prepend($err); - $(me).focus(); + if (focusonerror) { $(me).focus(); } return true; } } @@ -1914,7 +1914,7 @@ var UI = { main: mist.data.config, index: 'name' }, - help: 'You can name your MistServer here for personal use. You’ll still need to set host name within your network yourself.' + help: 'You can name your MistServer here for personal use. You???ll still need to set host name within your network yourself.' },{ type: 'debug', label: 'Debug level', @@ -1930,7 +1930,7 @@ var UI = { main: mist.data, index: 'save' }, - help: 'Tick the box in order to force an immediate save to the config.json MistServer uses to save your settings. Saving will otherwise happen upon closing MistServer. Don’t forget to press save after ticking the box.' + help: 'Tick the box in order to force an immediate save to the config.json MistServer uses to save your settings. Saving will otherwise happen upon closing MistServer. Don???t forget to press save after ticking the box.' },{ type: 'buttons', buttons: [{ @@ -2493,7 +2493,7 @@ var UI = { main: saveas, index: 'source' }, - help: 'Set the stream source.
VoD: You can browse to the file or folder as a source or simply enter the path to the file.
Live: You’ll need to enter "push://IP" with the IP of the machine pushing towards MistServer. You can use "push://" to accept any source.
Pro only: use "push://(IP)@password" to set a password protection for pushes.
If you\'re unsure how to set the source properly please view our Live pushing guide at the tools section.', + help: 'Set the stream source.
VoD: You can browse to the file or folder as a source or simply enter the path to the file.
Live: You???ll need to enter "push://IP" with the IP of the machine pushing towards MistServer. You can use "push://" to accept any source.
Pro only: use "push://(IP)@password" to set a password protection for pushes.
If you\'re unsure how to set the source properly please view our Live pushing guide at the tools section.', 'function': function(){ var source = $(this).val(); var type = null; From 9140994acae444486a7ae2201369d49a220ad665 Mon Sep 17 00:00:00 2001 From: cat Date: Fri, 10 Apr 2015 13:46:31 +0200 Subject: [PATCH 2/3] LSP - allow for .exe in protocol dependencies --- lsp/.directory | 4 ++++ lsp/mist.js | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 lsp/.directory diff --git a/lsp/.directory b/lsp/.directory new file mode 100644 index 00000000..a986e88c --- /dev/null +++ b/lsp/.directory @@ -0,0 +1,4 @@ +[Dolphin] +Timestamp=2015,4,10,12,58,21 +Version=3 +ViewMode=1 diff --git a/lsp/mist.js b/lsp/mist.js index 4502f940..7e925dbc 100644 --- a/lsp/mist.js +++ b/lsp/mist.js @@ -2129,6 +2129,10 @@ var UI = { var editing = false; if ((other != '') && (other >= 0)) { editing = true; } + var current = {}; + for (var i in mist.data.config.protocols) { + current[mist.data.config.protocols[i].connector] = 1; + } function buildProtocolSettings(kind) { var input = mist.data.capabilities.connectors[kind]; @@ -2179,7 +2183,8 @@ var UI = { for (var i in input.deps) { var $li = $('
  • ').text(input.deps[i]+' '); $ul.append($li); - if (typeof current[input.deps[i]] != 'undefined') { + if ((typeof current[input.deps[i]] != 'undefined') || (typeof current[input.deps[i]+'.exe'] != 'undefined')) { + //also check for the windows executable $li.append( $('').addClass('green').text('(Configured)') ); From f94141ca269d3a568915fae196f4c92f2ea3b1e5 Mon Sep 17 00:00:00 2001 From: cat Date: Fri, 10 Apr 2015 16:41:11 +0200 Subject: [PATCH 3/3] LSP - should now be minified --- lsp/minified.js | 124 ++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/lsp/minified.js b/lsp/minified.js index d8b29839..a66d9490 100644 --- a/lsp/minified.js +++ b/lsp/minified.js @@ -1,10 +1,10 @@ -var MD5=function(a){function c(a,c){var b,d,g,i,e;g=a&2147483648;i=c&2147483648;b=a&1073741824;d=c&1073741824;e=(a&1073741823)+(c&1073741823);return b&d?e^2147483648^g^i:b|d?e&1073741824?e^3221225472^g^i:e^1073741824^g^i:e^g^i}function b(a,b,d,g,i,e,k){a=c(a,c(c(b&d|~b&g,i),k));return c(a<>>32-e,b)}function d(a,b,d,g,i,e,k){a=c(a,c(c(b&g|d&~g,i),k));return c(a<>>32-e,b)}function f(a,b,d,g,i,e,k){a=c(a,c(c(b^d^g,i),k));return c(a<>>32-e,b)}function l(a,b,d,g,i,e,k){a=c(a,c(c(d^(b|~g), -i),k));return c(a<>>32-e,b)}function m(a){var b="",c="",d;for(d=0;3>=d;d++)c=a>>>8*d&255,c="0"+c.toString(16),b+=c.substr(c.length-2,2);return b}var e=[],p,n,i,v,g,k,j,h,e=a.replace(/\r\n/g,"\n"),a="";for(p=0;pn?a+=String.fromCharCode(n):(127n?a+=String.fromCharCode(n>>6|192):(a+=String.fromCharCode(n>>12|224),a+=String.fromCharCode(n>>6&63|128)),a+=String.fromCharCode(n&63|128));e=a;a=e.length;p=a+8;n=16*((p-p%64)/64+1);i=Array(n-1);for(g=v=0;g>>29;e=i;g=1732584193;k=4023233417;j=2562383102;h=271733878;for(a=0;a>>32-e,b)}function d(a,b,d,h,i,e,g){a=c(a,c(c(b&h|d&~h,i),g));return c(a<>>32-e,b)}function f(a,b,d,h,i,e,g){a=c(a,c(c(b^d^h,i),g));return c(a<>>32-e,b)}function l(a,b,d,h,i,e,g){a=c(a,c(c(d^(b|~h), +i),g));return c(a<>>32-e,b)}function m(a){var b="",c="",d;for(d=0;3>=d;d++)c=a>>>8*d&255,c="0"+c.toString(16),b+=c.substr(c.length-2,2);return b}var e=[],p,n,i,v,h,k,j,g,e=a.replace(/\r\n/g,"\n"),a="";for(p=0;pn?a+=String.fromCharCode(n):(127n?a+=String.fromCharCode(n>>6|192):(a+=String.fromCharCode(n>>12|224),a+=String.fromCharCode(n>>6&63|128)),a+=String.fromCharCode(n&63|128));e=a;a=e.length;p=a+8;n=16*((p-p%64)/64+1);i=Array(n-1);for(h=v=0;h>>29;e=i;h=1732584193;k=4023233417;j=2562383102;g=271733878;for(a=0;ab?1*d:a .menu"),secondary_menu:$("nav.secondary_menu"),main:$("main"),connection:{status:$("#connection"),user_and_host:$("#user_and_host"),msg:$("#message")}};UI.buildMenu();UI.stored.getOpts();if(location.hash){var a=location.hash.substring(1).split("@")[0].split("&");mist.user.name=a[0];a[1]&&(mist.user.host=a[1])}mist.send(function(){$(window).trigger("hashchange")},{},{timeout:5,hide:!0})}); $(window).on("hashchange",function(){var a=location.hash.substring(1).split("@");a[1]||(a[1]="");a=a[1].split("&");""==a[0]&&(a[0]="Overview");UI.showTab(a[0],a[1])}); var UI={debug:!1,elements:{},stored:{getOpts:function(){var a=localStorage.stored;a&&(a=JSON.parse(a));$.extend(!0,this.vars,a);return this.vars},saveOpt:function(a,c){this.vars[a]=c;localStorage.stored=JSON.stringify(this.vars);return this.vars},vars:{helpme:!0}},interval:{clear:function(){"undefined"!=typeof this.opts&&(clearInterval(this.opts.id),delete this.opts)},set:function(a,c){this.opts&&log("[interval]","Set called on interval, but an interval is already active.");this.opts={delay:c,callback:a}; @@ -22,7 +22,7 @@ function(){UI.popup.element.remove();UI.popup.element=null})})).append(a);$("bod buildMenu:function(){function a(a,b){var c=$("").addClass("button");c.html($("").addClass("plain").text(a)).append($("").addClass("highlighted").text(a));for(var d in b.classes)c.addClass(b.classes[d]);"LTSonly"in b&&c.addClass("LTSonly");"link"in b?c.attr("href",b.link).attr("target","_blank"):"submenu"in b||c.click(function(b){UI.navto(a);b.stopPropagation()});return c}var c=UI.elements.menu,b;for(b in UI.menu){0"));for(var d in UI.menu[b]){var f=UI.menu[b][d], l=a(d,f);c.append(l);if("submenu"in f){var m=$("").addClass("submenu");l.addClass("arrowdown").append(m);for(var e in f.submenu)m.append(a(e,f.submenu[e]))}}}b=$("
    ").attr("id","ih_button").text("?").click(function(){$("body").toggleClass("helpme");UI.stored.saveOpt("helpme",$("body").hasClass("helpme"))}).attr("title","Click to toggle the display of integrated help");UI.stored.getOpts().helpme&&$("body").addClass("helpme");c.after(b).after($("
    ").addClass("separator"))},buildUI:function(a){var c= $("
    ").addClass("input_container"),b;for(b in a){var d=a[b];if(d instanceof jQuery)c.append(d);else if("help"==d.type){var f=$("").addClass("text_container").append($("").addClass("description").append(d.help));c.append(f);if("classes"in d)for(var l in d.classes)f.addClass(d.classes[l])}else if("text"==d.type)c.append($("").addClass("text_container").append($("").addClass("text").append(d.text)));else if("custom"==d.type)c.append(d.custom);else if("buttons"==d.type)for(l in f= -$("").addClass("button_container"),"css"in d&&f.css(d.css),c.append(f),d.buttons){var m=d.buttons[l],e=$("