\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="",j.childNodes[0].style.borderCollapse="separate",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ra(a),g=l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Sa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Oa.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+eb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{
-marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();ca ").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({
-padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
diff --git a/app/files/tweaks/config/aio-app/jci/gui/addon-common/websocketd b/app/files/tweaks/config/aio-app/jci/gui/addon-common/websocketd
deleted file mode 100644
index a137fc5..0000000
Binary files a/app/files/tweaks/config/aio-app/jci/gui/addon-common/websocketd and /dev/null differ
diff --git a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/AIO-startup.js b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/AIO-startup.js
index cd661e6..ae48a98 100644
--- a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/AIO-startup.js
+++ b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/AIO-startup.js
@@ -1,3 +1,6 @@
+var turnScreenOff = false;
+var turnWifiOn = false; // this is experimental and may not work yet
+
function applyTweaks() {
var head = document.querySelector("head");
var body = document.getElementsByTagName("body")[0];
@@ -19,9 +22,33 @@ framework.transitionsObj._genObj._TEMPLATE_CATEGORIES_TABLE.AIOTweaksTmplt = "De
applyTweaks();
/* ** Attempt to start speedometer app on boot **
- ** Works in the emulator but not in the car ** * /
+** Works in the emulator but not in the car ** * /
setTimeout(function(){
- framework.sendEventToMmui("system","SelectApplications");
- setTimeout(function(){aioMagicRoute("_speedometer","Start");}, 4000);
+framework.sendEventToMmui("system","SelectApplications");
+setTimeout(function(){aioMagicRoute("_speedometer","Start");}, 4000);
}, 30000);
*/
+utility.loadScript('apps/_aiotweaks/js/mzd.js', null, function() {
+ if (turnWifiOn) {
+ framework.common._contextCategory._contextCategoryTable['netmgmt.*'] = "Other";
+ setTimeout(function() {
+ turnOnWifi();
+ }, 3000); // 3 second delay to let everything load up
+ }
+ if (turnScreenOff) {
+ setTimeout(function() {
+ turnScreenOff = setInterval(function() {
+ if (framework.getCurrCtxtId() === "DisplayOff") {
+ clearInterval(turnScreenOff);
+ turnScreenOff = null;
+ } else {
+ framework.sendEventToMmui("common", "Global.IntentSettingsTab", { payload: { settingsTab: "Display" } });
+ framework.sendEventToMmui("common", "Global.IntentHome");
+ }
+ setTimeout(function() {
+ framework.getCurrCtxtId() === "DisplayOff" ? null : framework.sendEventToMmui("syssettings", "SelectDisplayOff");
+ }, 1000);
+ }, 5000);
+ }, 5000);
+ }
+});
diff --git a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/_aiotweaksApp.js b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/_aiotweaksApp.js
index 8243989..f5885ea 100644
--- a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/_aiotweaksApp.js
+++ b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/_aiotweaksApp.js
@@ -25,9 +25,11 @@ function _aiotweaksApp(uiaId) {
* Called just after the app is instantiated by framework.
* All variables local to this app should be declared in this function
*/
-_aiotweaksApp.prototype.appInit = function () {
+_aiotweaksApp.prototype.appInit = function() {
log.debug("_aiotweaksApp appInit called...");
+ this.stopMsgTimeout = null;
+
//Context table
//@formatter:off
this._contextTable = {
@@ -55,14 +57,23 @@ _aiotweaksApp.prototype.appInit = function () {
* CONTEXT CALLBACKS
* =========================
*/
-_aiotweaksApp.prototype._AtSpeedMsgHandler = function (msg) {
+_aiotweaksApp.prototype._AtSpeedMsgHandler = function(msg) {
log.info("AIO Tweaks App Received AtSpeedMsg" + msg);
+ framework.common.setSbName("AIO Tweaks - Driving...");
}
-_aiotweaksApp.prototype._NoSpeedMsgHandler = function (msg) {
+_aiotweaksApp.prototype._NoSpeedMsgHandler = function(msg) {
log.info("AIO Tweaks App Received NoSpeedMsg" + msg);
+ framework.common.setSbName("AIO Tweaks - Stop!");
+ clearTimeout(this.stopMsgTimeout);
+ this.stopMsgTimeout = setTimeout(function() {
+ if (framework.getCurrentApp() === '_aiotweaks') {
+ framework.common.setSbName("AIO Tweaks");
+ }
+ }, 2000); // Show for 2 seconds
+
}
// from usbaudioApp - test to see if this works
-_aiotweaksApp.prototype._TimedSbn_CurrentSongMsgHandler = function (msg) {
+_aiotweaksApp.prototype._TimedSbn_CurrentSongMsgHandler = function(msg) {
framework.common.startTimedSbn(this.uiaId, 'TimedSbn_UsbAudio_CurrentSong', 'typeE', {
sbnStyle: 'Style02',
imagePath1: 'IcnSbnEnt.png',
@@ -70,11 +81,11 @@ _aiotweaksApp.prototype._TimedSbn_CurrentSongMsgHandler = function (msg) {
text2: msg.params.payload.title,
});
};
-_aiotweaksApp.prototype._StartContextReady = function () {
+_aiotweaksApp.prototype._StartContextReady = function() {
framework.common.setSbDomainIcon("apps/_aiotweaks/app.png");
};
-_aiotweaksApp.prototype._StartContextOut = function () {
+_aiotweaksApp.prototype._StartContextOut = function() {
var currTwks = document.getElementsByTagName("body")[0].className;
if (currTwks.length > 0) {
localStorage.setItem("aio.tweaks", currTwks);
diff --git a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/mzd.js b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/mzd.js
index 1f5bcad..6d7806f 100644
--- a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/mzd.js
+++ b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/js/mzd.js
@@ -1,19 +1,19 @@
// *****************************
-// ** AIO Tweaks App v0.6 - mzd.js
+// ** AIO Tweaks App v0.7 - mzd.js
// ** All the functions for Buttons in AIO Tweaks App
// ** By Trezdog44
// *****************************
/* jshint -W117 */
-var aioTweaksVer = 0;
+var aioTweaksVer = 0.7;
var AArunning = false;
var appListData = [];
//var wsAIO = null;
//var aioWsVideo = null;
//var AIOvideo = false;
-$(document).ready(function() {
+function StartAIOApp() {
try {
-$('#SbSpeedo, #Sbfuel-bar-wrapper').fadeOut();
+ $('#SbSpeedo, #Sbfuel-bar-wrapper').fadeOut();
//framework.sendEventToMmui("common", "SelectBTAudio");
} catch (err) {
@@ -71,6 +71,7 @@ $('#SbSpeedo, #Sbfuel-bar-wrapper').fadeOut();
$("#reverseAppListBtn").on("click", reverseApplicationList);
$("#shiftEntListBtn").on("click", shiftEntertainmentList);
$("#devModeSecretBtn").on("click", toggleDevMode);
+ $("#wifiToggle").on("click", turnOnWifi);
$("#showBgBtn").on("click", function() { $("html").addClass("showBg") });
$("#twkOut").on("click", function() { framework.sendEventToMmui("common", "Global.IntentHome") });
$("#usba").on("click", function() { framework.sendEventToMmui("system", "SelectUSBA") });
@@ -115,7 +116,7 @@ $('#SbSpeedo, #Sbfuel-bar-wrapper').fadeOut();
} else {
console.log("localStorage Not Supported!!");
}*/
-});
+}
// *****************************
// ** Button Functions GO!
// *****************************
@@ -170,6 +171,22 @@ _MainMenuLoop = function(direction) {
}
}
+function turnOnWifi() {
+ var net, wifiOn = 1; // 0 for off
+ if (framework.getAppInstance('netmgmt') === undefined || framework.getAppInstance('syssettings') === undefined) { // only jump if needed
+ framework.sendEventToMmui("common", "Global.IntentHome");
+ framework.sendEventToMmui("common", "Global.IntentSettingsTab", { payload: { settingsTab: "Devices" } });
+ framework.sendEventToMmui("syssettings", "SelectNetworkManagement"); // this may not be needed
+ framework.sendEventToMmui("common", "Global.IntentHome"); // Jump back to home screen?
+ }
+ setTimeout(function() {
+ net = framework.getAppInstance('netmgmt');
+ if (!net._onOffStatus) {
+ framework.sendEventToMmui('netmgmt', 'SetWifiConnection', { payload: { offOn: wifiOn } });
+ }
+ }, 1000); //give it a second to load
+}
+
function shiftEntertainmentList() {
var entList = framework.getAppInstance('system')._masterEntertainmentDataList.items;
var shiftItem = entList.shift();
@@ -279,8 +296,17 @@ function RunCheckIP() {
}
function myTest() {
- framework.common.startTimedSbn(this.uiaId, "SbnAIOTest", "typeE", { sbnStyle: "Style02", imagePath1: 'apps/_aiotweaks/panda.png', text1: this.uiaId, text2: "Pandas are coming for you!!" });
- //aioWs('node -e "console.log(\'Test\')"', 1);
+ var msgChoice = Math.round(Math.random() * 10/3);
+ switch (msgChoice) {
+ case 1:
+ framework.common.startTimedSbn(this.uiaId, "SbnAIOTest", "typeE", { sbnStyle: "Style02", imagePath1: 'apps/_aiotweaks/panda.png', text1: this.uiaId, text2: "Pandamonium!!" });
+ break
+ case 2:
+ framework.common.startTimedSbn(this.uiaId, "SbnAIOTest", "typeE", { sbnStyle: "Style02", imagePath1: 'apps/_aiotweaks/panda.png', text1: this.uiaId, text2: "Enter the Panda!!" });
+ break
+ default:
+ framework.common.startTimedSbn(this.uiaId, "SbnAIOTest", "typeE", { sbnStyle: "Style02", imagePath1: 'apps/_aiotweaks/panda.png', text1: this.uiaId, text2: "Pandas are coming for you!!" });
+ }
}
function chooseBackground() {
@@ -356,8 +382,12 @@ function AioFileCheck(fc) {
case "_SWAP":
//$('#mountSwapBtn').html('
Mount Swapfile ').show();
//$('#createSwapBtn').off('click').on('click',deleteSwap).html('
Delete Swapfile ');
- $('#mountSwapBtn').show();
- $('#unmountSwapBtn').show();
+ if (framework.getCurrentApp() === "_aiotweaks") {
+ $('#mountSwapBtn').show();
+ $('#unmountSwapBtn').show();
+ } else if (UMswap === null) {
+ swapfileShutdownUnmount();
+ }
break;
case "_NOSWAP":
$('#mountSwapBtn').remove();
@@ -464,12 +494,12 @@ function showVersion() {
function displayOff() {
if (framework.getAppInstance('syssettings') === undefined) {
+ framework.sendEventToMmui("common", "Global.IntentHome");
framework.sendEventToMmui("common", "Global.IntentSettingsTab", { payload: { settingsTab: "Display" } });
}
framework.sendEventToMmui("syssettings", "SelectDisplayOff");
- //} else {
- // framework.sendEventToMmui("system", "DisplayOffGUIActivity");
- //}
+ //framework.sendEventToMmui("system","SelectIdleStandby");
+ //framework.sendEventToMmui("system","DisplayOffGUIActivity");
}
function showHeadunitLog() {
diff --git a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/css/AIOTweaksTmplt.css b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/css/AIOTweaksTmplt.css
index 3b23775..153a053 100644
--- a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/css/AIOTweaksTmplt.css
+++ b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/css/AIOTweaksTmplt.css
@@ -1,6 +1,10 @@
.AIOTweaksTmplt {
vertical-align: middle;
text-align: center;
+ font-family: "Tipperary", Arial, Helvetica, sans-serif;
+}
+.AIOTweaksTmplt textarea, .AIOTweaksTmplt input, .AIOTweaksTmplt button {
+ font-family: 'DejaVu Sans Mono', "monospace", "Tipperary", "Arial", "Helvetica", "sans-serif";
}
.AIOTweaksTmplt ul.tab {
list-style-type: none;
@@ -88,17 +92,19 @@
border-radius: 5px;
box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
}
-.animate-zoom {
- animation: animatezoom 0.6s
-}
@keyframes animatezoom {
- from {
- transform: scale(0)
+ 0% {
+ transform: scale(0, 0) translate(0px, 100px);
+ -o-transform: scale(0, 0) translate(0px, 100px);
}
- to {
- transform: scale(1)
+ 100% {
+ transform: scale(1, 1) translate(0px, 0px);
+ -o-transform: scale(1, 1) translate(0px, 0px);
}
}
+.animate-zoom {
+ animation: animatezoom 0.9s ease-in both;
+}
.AIOTweaksTmplt .sidenav {
height: 100%;
width: 0;
diff --git a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/js/AIOTweaksTmplt.js b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/js/AIOTweaksTmplt.js
index fcb37ab..275b900 100644
--- a/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/js/AIOTweaksTmplt.js
+++ b/app/files/tweaks/config/aio-app/jci/gui/apps/_aiotweaks/templates/AIOTweaks/js/AIOTweaksTmplt.js
@@ -55,14 +55,16 @@ function AIOTweaksTmplt(uiaId, parentDiv, templateID, controlProperties) {
'
' +
'
' +
- '';
+ '';
function AIOTabs(tab, tabLink) {
$(".tablinks").removeClass("active-tab");
$(".tabcontent").hide();
+ $(".tabcontent").removeClass("animate-zoom");
$("button").removeClass("selectedItem");
maxButtons = $(tab + " a").length - 2;
$(tab).show();
+ $(tab).addClass('animate-zoom');
(selectedItem < maxButtons) ? $(tab + " button").eq(selectedItem).addClass("selectedItem"): selectedItem = 0;
$(tabLink).addClass("active-tab");
currTab = tab;
@@ -129,12 +131,13 @@ function AIOTweaksTmplt(uiaId, parentDiv, templateID, controlProperties) {
$("Disk Space ').appendTo($('#Options'));
$("Memory Info ').appendTo($('#Options'));
$("Running Processes ').appendTo($('#Options'));
- //$("Screen Off ').appendTo($('#Options'));
+ $("Screen Off ').appendTo($('#Options'));
//$("Check IP ').appendTo($('#Options'));
$("Reverse App List ').appendTo($('#Options'));
$("Settings > System ').appendTo($('#Options'));
- $("WIFI Settings ').appendTo($('#Options'));
- $("WifiAP ').appendTo($('#Options'));
+ $("Turn WiFi On ').appendTo($('#Options'));
+ $("WiFi Settings ').appendTo($('#Options'));
+ $("Wifi AP ').appendTo($('#Options'));
$("Stop Firewall ').appendTo($('#Options'));
$("System Restore ').appendTo($('#Options'));
$("Reboot ').appendTo($('#Options'));
@@ -183,7 +186,7 @@ function AIOTweaksTmplt(uiaId, parentDiv, templateID, controlProperties) {
} catch (e) {
$("#Opt").click();
}
- utility.loadScript('apps/_aiotweaks/js/mzd.js');
+ utility.loadScript('apps/_aiotweaks/js/mzd.js', null, StartAIOApp);
}
/*
@@ -242,11 +245,6 @@ AIOTweaksTmplt.prototype.handleControllerEvent = function(eventID) {
$(currTab + " a").eq(selectedItem).parent().addClass("selectedItem");
}
break;
- case "upStart":
- this.longHold(function() {
- //do the same as up
- this.handleControllerEvent("up");
- })
case "up":
this.singleClick(function() {
@@ -305,7 +303,7 @@ AIOTweaksTmplt.prototype.handleControllerEvent = function(eventID) {
break;
}
$("button").blur();
- $("html").removeClass("showBg");
+ if(eventID.indexOf('Start')!==-1) $("html").removeClass("showBg");
return retValue;
};
/*
diff --git a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.js b/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.js
deleted file mode 100644
index 612dfe7..0000000
--- a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.js
+++ /dev/null
@@ -1,165 +0,0 @@
-var systemAppId = 'system';
-var additionalAppsConfig = '/jci/opera/opera_dir/userjs/additionalApps.json';
-var additionalApps = [];
-
-/**
- * Sets up the additional apps and MMUI message interception magic
- */
-function addAdditionalApps() {
- var category = 'Applications';
-
- // check that we're in the system app
- if(typeof framework === 'object' && framework._currentAppUiaId === systemAppId) {
- var systemApp = framework.getAppInstance(systemAppId);
-
- if(!systemApp.hasAdditionalApps) {
- systemApp.hasAdditionalApps = true; // so we only do this if needed
-
- // load additional app definitions from from
- getJSON('file://localhost' + additionalAppsConfig, function(data) {
- additionalApps = JSON.parse(data);
- }, function(status) {
- framework.log.error('Unable to load additionalApps from ' + additionalAppsConfig);
- });
- // add additional apps to 'Applications' list
- for (var i = 0; i < additionalApps.length; ++i) {
- var additionalApp = additionalApps[i];
- systemApp._masterApplicationDataList.items.push({ appData : { appName : additionalApp.name, isVisible : true, mmuiEvent : 'Select'+additionalApp.name }, text1Id : additionalApp.name, disabled : false, itemStyle : 'style01', hasCaret : false });
- framework.localize._appDicts[systemAppId][additionalApp.name] = additionalApp.label;
- framework.common._contextCategory._contextCategoryTable[additionalApp.name+'.*'] = category;
- if (additionalApp.preload != null) {
- var preloadPath = "apps/" + additionalApp.name + "/js/" + additionalApp.preload;
- utility.loadScript(preloadPath);
- }
- }
-
- // intercept app selection from the list to do our magic
- systemApp._contextTable[category].controlProperties.List2Ctrl.selectCallback = additionalAppMenuItemSelectCallback.bind(systemApp);
-
- // intercept MMUI messages in the framework
- framework.origRouteMmuiMsg = framework.routeMmuiMsg;
- framework.routeMmuiMsg = additionalAppRouteMmuiMsg.bind(framework);
- framework.sendEventToMmui = additionalAppSendEventToMmui.bind(framework);
- }
- }
-}
-
-/**
- * Using a disabled app from the list of apps in systemApp.js as a replacement to the MMUI
- */
-var additionalAppReplacedAppName = 'vdt';
-var additionalAppReplacedAppContext = 'DriveChartDetails';
-var additionalAppReplacedMmuiEvent = 'SelectDriveRecord';
-
-/**
- * Interceptor for systemApp._menuItemSelectCallback
- */
-function additionalAppMenuItemSelectCallback(listCtrlObj, appData, params) {
- for (var i = 0; i < additionalApps.length; ++i) {
- var additionalApp = additionalApps[i];
- if(additionalApp.name === appData.appName) {
- framework.additionalAppName = appData.appName;
- framework.additionalAppContext = 'Start';
- appData = JSON.parse(JSON.stringify(appData));
- appData.appName = additionalAppReplacedAppName;
- appData.mmuiEvent = additionalAppReplacedMmuiEvent;
- break;
- }
- }
- this._menuItemSelectCallback(listCtrlObj, appData, params);
-}
-
-/**
- * Interceptor for Framework.routeMmuiMsg
- */
-function additionalAppRouteMmuiMsg(jsObject) {
- switch(jsObject.msgType) {
- case 'ctxtChg':
- if(this.additionalAppName && jsObject.uiaId == additionalAppReplacedAppName) {
- jsObject.uiaId = this.additionalAppName;
- jsObject.ctxtId = this.additionalAppContext;
- }
- break;
- case 'focusStack':
- var additionalAppInFocusStack = false;
- if(this.additionalAppName) {
- for(var i = 0; i < jsObject.appIdList.length; i++) {
- var appId = jsObject.appIdList[i];
- if(appId.id == additionalAppReplacedAppName) {
- appId.id = this.additionalAppName;
- }
- if(appId.id == this.additionalAppName) {
- additionalAppInFocusStack = true;
- }
- }
- }
- if(!additionalAppInFocusStack) {
- this.additionalAppName = null;
- this.additionalAppContext = null;
- }
- case 'msg': // fall-through to alert
- case 'alert':
- if(this.additionalAppName && jsObject.uiaId == additionalAppReplacedAppName) {
- jsObject.uiaId = this.additionalAppName;
- }
- break;
- default:
- // do nothing
- break;
- }
-
- this.origRouteMmuiMsg(jsObject);
-}
-
-/**
- * Interceptor for Framework.sendEventToMmui
- */
-function additionalAppSendEventToMmui(uiaId, eventId, params, fromVui)
-{
- if(uiaId == this.additionalAppName) {
- uiaId = additionalAppReplacedAppName;
- }
-
- var currentUiaId = this.getCurrentApp();
- var currentContextId = this.getCurrCtxtId();
-
- if(currentUiaId == this.additionalAppName) {
- currentUiaId = additionalAppReplacedAppName;
- currentContextId = additionalAppReplacedAppContext;
- }
-
- this.websockets.sendEventMsg(uiaId, eventId, params, fromVui, currentUiaId, currentContextId);
-
- // Let debug know about the message
- this.debug.triggerEvtToMmuiCallbacks(uiaId, eventId, params);
-}
-
-/**
- * Helper function to get JSON data
- */
-function getJSON(url, successHandler, errorHandler) {
- var xhr = new XMLHttpRequest();
- xhr.open('GET', url, false);
- xhr.timeout = 30000;
- xhr.onload = function() {
- var status = xhr.status;
- if (status == 0) {
- successHandler && successHandler(xhr.response);
- } else {
- errorHandler && errorHandler(status);
- }
- };
- xhr.onerror = function() {
- var status = xhr.status;
- };
- xhr.send();
-}
-
-/**
- * Function to get the whole thing started.
- */
-(function () {
- window.opera.addEventListener('AfterEvent.load', function (e) {
- addAdditionalApps();
- });
-})();
diff --git a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.json b/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.json
deleted file mode 100644
index a0e62f8..0000000
--- a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/additionalApps.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- { "name": "_aiotweaks", "label": "AIO Tweaks" }
-]
diff --git a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/aio-startup.js b/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/aio-startup.js
deleted file mode 100644
index 299f3f8..0000000
--- a/app/files/tweaks/config/aio-app/jci/opera/opera_dir/userjs/aio-startup.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function applyTweaks(){
- var body = document.getElementsByTagName('body')[0];
- var head = document.querySelector("head");
- if(!document.getElementById("jquery-script") && !document.getElementById("jquery1-script"))
- {
- var JQscript = document.createElement("script");
- JQscript.setAttribute("id", "jquery-script");
- JQscript.setAttribute("src", "addon-common/jquery.min.js");
- body.appendChild(JQscript);
- }
- var savedTweaks = JSON.parse(localStorage.getItem('aiotweaks'));
- if(savedTweaks !== null)
- {
- if (!document.getElementById('aiocss'))
- {
- var link = document.createElement('link');
- link.id = 'aiocss';
- link.rel = 'stylesheet';
- link.type = 'text/css';
- link.href = '/jci/gui/apps/_aiotweaks/css/_aiotweaksApp.css';
- link.media = 'all';
- head.appendChild(link);
- }
- body.className = savedTweaks;
- }
-}
-
-(function (){
- window.opera.addEventListener("AfterEvent.load", function (e){
- setTimeout(applyTweaks, 5000);
- });
-})();
diff --git a/app/files/tweaks/config/aio-app/stage_wifi.sh b/app/files/tweaks/config/aio-app/stage_wifi.sh
deleted file mode 100644
index 0763b11..0000000
--- a/app/files/tweaks/config/aio-app/stage_wifi.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-### AIO Tweaks App
-/jci/gui/addon-common/websocketd --port=9997 sh &
diff --git a/app/files/tweaks/config/androidauto/data_persist/dev/bin/headunit-wrapper b/app/files/tweaks/config/androidauto/data_persist/dev/bin/headunit-wrapper
index ac1ea5a..09d4299 100644
--- a/app/files/tweaks/config/androidauto/data_persist/dev/bin/headunit-wrapper
+++ b/app/files/tweaks/config/androidauto/data_persist/dev/bin/headunit-wrapper
@@ -2,9 +2,34 @@
SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
+HEADUNIT_CMD="${SCRIPTPATH}/headunit"
+LOGPATH=/tmp/mnt/data/headunit.log
+SCRIPT_ARGS=$@
export LD_LIBRARY_PATH="${SCRIPTPATH}/headunit_libs:/jci/lib:/jci/opera/3rdpartylibs/freetype:/usr/lib/imx-mm/audio-codec:/usr/lib/imx-mm/parser:/data_persist/dev/lib:"
#override some GST plugins with these
export GST_PLUGIN_PATH="${SCRIPTPATH}/headunit_libs"
-taskset 0xFFFFFFFF "${SCRIPTPATH}/headunit" "$@" 2>&1 | tee /tmp/mnt/data/headunit.log
+# This function starts the headunit process and
+# sets the process affinity via taskset. The
+# return value of this function is the pid of
+# the headunit process.
+start_headunit()
+{
+ local pid
+ taskset 0xFFFFFFFF "${HEADUNIT_CMD}" "$@" 2>&1 | tee ${LOGPATH}
+ # return the pid -- technically this is for "tee", but if
+ # headunit crashes, the pipe will break and tee should exit.
+ echo $!
+}
+
+headunit_pid=$(start_headunit "${SCRIPT_ARGS}")
+# loop forever. every 10 seconds, check if headunit is running.
+# if it's not running, start it again.
+while true
+do
+ sleep 10
+ if ! kill -0 ${headunit_pid} >/dev/null 2>&1 ; then
+ headunit_pid=$(start_headunit "${SCRIPT_ARGS}")
+ fi
+done
diff --git a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/js/_androidautoApp.js b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/js/_androidautoApp.js
index 8574000..6af21de 100644
--- a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/js/_androidautoApp.js
+++ b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/js/_androidautoApp.js
@@ -110,9 +110,9 @@ function AAlogPoll() {
}
var psconsole = document.getElementById('aaStatusText');
if (debugTxt != null && psconsole != null) {
- var atBottom = (psconsole.scrollTop == psconsole.scrollHeight);
- psconsole.focus();
psconsole.value = debugTxt;
+ psconsole.focus();
+ var atBottom = (psconsole.scrollTop == psconsole.scrollHeight);
if (psconsole.length && atBottom)
psconsole.scrollTop = psconsole.scrollHeight;
diff --git a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/css/AndroidAutoTmplt.css b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/css/AndroidAutoTmplt.css
index 3187c4a..4ce30b2 100644
--- a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/css/AndroidAutoTmplt.css
+++ b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/css/AndroidAutoTmplt.css
@@ -1,4 +1,8 @@
.AndroidAutoTmplt {
+ font-family: "Tipperary", "Arial", "Helvetica", "sans-serif";
vertical-align: middle;
text-align: center;
}
+.AndroidAutoTmplt textarea {
+ font-family: "Tipperary", "Arial", "Helvetica", "sans-serif";
+}
diff --git a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/js/AndroidAutoTmplt.js b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/js/AndroidAutoTmplt.js
index 4c30988..a3ab170 100644
--- a/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/js/AndroidAutoTmplt.js
+++ b/app/files/tweaks/config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/js/AndroidAutoTmplt.js
@@ -16,7 +16,7 @@ function AndroidAutoTmplt(uiaId, parentDiv, templateID, controlProperties) {
this.divElt.id = templateID;
this.divElt.className = 'TemplateWithStatusLeft AndroidAutoTmplt';
parentDiv.appendChild(this.divElt);
- this.divElt.innerHTML = '\r\nHeadunit for Android Auto™ \r\n<\/p>\r\n
\r\n© 2011-2016 Original Author: Michael A. Reid. (mikereidis@gmail.com)\r\n<\/p>\r\n
\r\nPortions © 2015-2017 Konsulko Group, S Padival, A Gartner, and others\r\n<\/p>\r\n
\r\nPorted to Mazda Connect by S Padival (spadival@gmail.com) All Rights Reserved\r\n<\/p>\r\n
\r\nhttps:\/\/github.com\/gartnera\/headunit\/\r\n<\/p>\r\n
\r\n
