From 707bc4ef09a1e76d02e2a22d8608c26e02b449d1 Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 01:07:46 +0800 Subject: [PATCH 1/7] Make sidebar scrollable --- production/css/custom.css | 1 - 1 file changed, 1 deletion(-) diff --git a/production/css/custom.css b/production/css/custom.css index 379ed21..1622e6b 100755 --- a/production/css/custom.css +++ b/production/css/custom.css @@ -1,7 +1,6 @@ body.nav-sm .container.body .left_col { width: 70px; padding: 0; - position: fixed; height: 100%; z-index: 200; } From ecd671b2de195be7d2871a79926a2fe4ac9f6526 Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 16:46:54 +0800 Subject: [PATCH 2/7] Fix problem on accessing font-awesome cdn when accesing on secured server --- production/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/form.html b/production/form.html index df23c49..800901b 100755 --- a/production/form.html +++ b/production/form.html @@ -21,7 +21,7 @@ - + From eb664a811eb88c750f923c2402dc7d9c2161031d Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 19:44:37 +0800 Subject: [PATCH 3/7] Fix excess space on content on nav-sm --- production/css/custom.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/production/css/custom.css b/production/css/custom.css index 1622e6b..92c145e 100755 --- a/production/css/custom.css +++ b/production/css/custom.css @@ -3,7 +3,9 @@ body.nav-sm .container.body .left_col { padding: 0; height: 100%; z-index: 200; + position: absolute; } + body.nav-sm .container.body .right_col { padding: 10px 20px; margin-left: 70px; From f912572af8088e9a39ae460e1c369645eb744484 Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 20:23:50 +0800 Subject: [PATCH 4/7] Remove nicescroll this is not working since the beginning --- production/calender.html | 2 +- production/chartjs.html | 1 - production/chartjs2.html | 1 - production/contacts.html | 2 +- production/e_commerce.html | 2 +- production/echarts.html | 1 - production/empty.html | 1 - production/form.html | 2 +- production/form_advanced.html | 2 +- production/form_buttons.html | 2 +- production/form_upload.html | 2 +- production/form_validation.html | 1 - production/form_wizards.html | 1 - production/general_elements.html | 1 - production/glyphicons.html | 1 - production/icons.html | 1 - production/inbox.html | 1 - production/index.html | 1 - production/index2.html | 1 - production/index3.html | 1 - production/invoice.html | 1 - production/js/custom.js | 11 -- .../js/nicescroll/jquery.nicescroll.min.js | 111 ------------------ 23 files changed, 7 insertions(+), 143 deletions(-) delete mode 100755 production/js/nicescroll/jquery.nicescroll.min.js diff --git a/production/calender.html b/production/calender.html index cc6c08d..40dc6a9 100755 --- a/production/calender.html +++ b/production/calender.html @@ -475,7 +475,7 @@ - + diff --git a/production/chartjs.html b/production/chartjs.html index b2237b0..032aa76 100755 --- a/production/chartjs.html +++ b/production/chartjs.html @@ -532,7 +532,6 @@ - diff --git a/production/chartjs2.html b/production/chartjs2.html index 3654981..f81b2d0 100755 --- a/production/chartjs2.html +++ b/production/chartjs2.html @@ -526,7 +526,6 @@ - diff --git a/production/contacts.html b/production/contacts.html index 84e570e..e2cb2bf 100755 --- a/production/contacts.html +++ b/production/contacts.html @@ -736,7 +736,7 @@ - + diff --git a/production/e_commerce.html b/production/e_commerce.html index 60c1b93..9235092 100755 --- a/production/e_commerce.html +++ b/production/e_commerce.html @@ -522,7 +522,7 @@ - + diff --git a/production/echarts.html b/production/echarts.html index 1d59ad5..b4eb953 100755 --- a/production/echarts.html +++ b/production/echarts.html @@ -712,7 +712,6 @@ - diff --git a/production/empty.html b/production/empty.html index 458d4ec..9a93a41 100644 --- a/production/empty.html +++ b/production/empty.html @@ -186,7 +186,6 @@ - diff --git a/production/form.html b/production/form.html index 800901b..ea22978 100755 --- a/production/form.html +++ b/production/form.html @@ -1405,7 +1405,7 @@ - + diff --git a/production/form_advanced.html b/production/form_advanced.html index 5e873a6..b527c18 100755 --- a/production/form_advanced.html +++ b/production/form_advanced.html @@ -1822,7 +1822,7 @@ - + diff --git a/production/form_buttons.html b/production/form_buttons.html index a9d7a2b..dbd7381 100755 --- a/production/form_buttons.html +++ b/production/form_buttons.html @@ -805,7 +805,7 @@ - + diff --git a/production/form_upload.html b/production/form_upload.html index 74d5d78..f2d6521 100755 --- a/production/form_upload.html +++ b/production/form_upload.html @@ -402,7 +402,7 @@ - + diff --git a/production/form_validation.html b/production/form_validation.html index f81746b..2ac4e5f 100755 --- a/production/form_validation.html +++ b/production/form_validation.html @@ -480,7 +480,6 @@ - diff --git a/production/form_wizards.html b/production/form_wizards.html index 1ed0942..812e1b5 100755 --- a/production/form_wizards.html +++ b/production/form_wizards.html @@ -656,7 +656,6 @@ - diff --git a/production/general_elements.html b/production/general_elements.html index b584735..f960010 100755 --- a/production/general_elements.html +++ b/production/general_elements.html @@ -1675,7 +1675,6 @@ - diff --git a/production/glyphicons.html b/production/glyphicons.html index 95c1fea..8aa3d0c 100755 --- a/production/glyphicons.html +++ b/production/glyphicons.html @@ -1786,7 +1786,6 @@ - diff --git a/production/icons.html b/production/icons.html index 1897c52..0e8da67 100755 --- a/production/icons.html +++ b/production/icons.html @@ -2390,7 +2390,6 @@ - diff --git a/production/inbox.html b/production/inbox.html index 9957d99..42cf95b 100755 --- a/production/inbox.html +++ b/production/inbox.html @@ -592,7 +592,6 @@ - diff --git a/production/index.html b/production/index.html index c4e0c8a..4ffa4ef 100755 --- a/production/index.html +++ b/production/index.html @@ -1098,7 +1098,6 @@ - diff --git a/production/index2.html b/production/index2.html index d4f9820..8e9c5e4 100755 --- a/production/index2.html +++ b/production/index2.html @@ -811,7 +811,6 @@ - diff --git a/production/index3.html b/production/index3.html index 8077734..884490b 100755 --- a/production/index3.html +++ b/production/index3.html @@ -929,7 +929,6 @@ - diff --git a/production/invoice.html b/production/invoice.html index e0b17c0..dab6e23 100755 --- a/production/invoice.html +++ b/production/invoice.html @@ -549,7 +549,6 @@ - diff --git a/production/js/custom.js b/production/js/custom.js index 8530013..7757e7d 100755 --- a/production/js/custom.js +++ b/production/js/custom.js @@ -311,17 +311,6 @@ $(function () { /** ****** Accordion *********************** **/ -/** ****** scrollview *********************** **/ -$(document).ready(function () { - - $(".scroll-view").niceScroll({ - touchbehavior: true, - cursorcolor: "rgba(42, 63, 84, 0.35)" - }); - -}); -/** ****** /scrollview *********************** **/ - /** ****** NProgress *********************** **/ if (typeof NProgress != 'undefined') { $(document).ready(function () { diff --git a/production/js/nicescroll/jquery.nicescroll.min.js b/production/js/nicescroll/jquery.nicescroll.min.js deleted file mode 100755 index 0c5c9ae..0000000 --- a/production/js/nicescroll/jquery.nicescroll.min.js +++ /dev/null @@ -1,111 +0,0 @@ -/* jquery.nicescroll 3.2.0 InuYaksa*2013 MIT http://areaaperta.com/nicescroll */(function(e){var y=!1,D=!1,J=5E3,K=2E3,x=0,L=function(){var e=document.getElementsByTagName("script"),e=e[e.length-1].src.split("?")[0];return 0f){if(b.getScrollTop()>=b.page.maxh)return!0}else if(0>=b.getScrollTop())return!0;b.scrollmom&&b.scrollmom.stop(); -b.lastdeltay+=f;b.debounced("mousewheely",function(){var d=b.lastdeltay;b.lastdeltay=0;b.rail.drag||b.doScrollBy(d)},120)}d.stopImmediatePropagation();return d.preventDefault()}var b=this;this.version="3.4.0";this.name="nicescroll";this.me=c;this.opt={doc:e("body"),win:!1};e.extend(this.opt,F);this.opt.snapbackspeed=80;if(k)for(var q in b.opt)"undefined"!=typeof k[q]&&(b.opt[q]=k[q]);this.iddoc=(this.doc=b.opt.doc)&&this.doc[0]?this.doc[0].id||"":"";this.ispage=/BODY|HTML/.test(b.opt.win?b.opt.win[0].nodeName: -this.doc[0].nodeName);this.haswrapper=!1!==b.opt.win;this.win=b.opt.win||(this.ispage?e(window):this.doc);this.docscroll=this.ispage&&!this.haswrapper?e(window):this.win;this.body=e("body");this.iframe=this.isfixed=this.viewport=!1;this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName;this.istextarea="TEXTAREA"==this.win[0].nodeName;this.forcescreen=!1;this.canshowonmouseevent="scroll"!=b.opt.autohidemode;this.page=this.view=this.onzoomout=this.onzoomin=this.onscrollcancel= -this.onscrollend=this.onscrollstart=this.onclick=this.ongesturezoom=this.onkeypress=this.onmousewheel=this.onmousemove=this.onmouseup=this.onmousedown=!1;this.scroll={x:0,y:0};this.scrollratio={x:0,y:0};this.cursorheight=20;this.scrollvaluemax=0;this.observerremover=this.observer=this.scrollmom=this.scrollrunning=this.checkrtlmode=!1;do this.id="ascrail"+K++;while(document.getElementById(this.id));this.hasmousefocus=this.hasfocus=this.zoomactive=this.zoom=this.selectiondrag=this.cursorfreezed=this.cursor= -this.rail=!1;this.visibility=!0;this.hidden=this.locked=!1;this.cursoractive=!0;this.overflowx=b.opt.overflowx;this.overflowy=b.opt.overflowy;this.nativescrollingarea=!1;this.checkarea=0;this.events=[];this.saved={};this.delaylist={};this.synclist={};this.lastdeltay=this.lastdeltax=0;this.detected=M();var f=e.extend({},this.detected);this.ishwscroll=(this.canhwscroll=f.hastransform&&b.opt.hwacceleration)&&b.haswrapper;this.istouchcapable=!1;f.cantouch&&(f.ischrome&&!f.isios&&!f.isandroid)&&(this.istouchcapable= -!0,f.cantouch=!1);f.cantouch&&(f.ismozilla&&!f.isios)&&(this.istouchcapable=!0,f.cantouch=!1);b.opt.enablemouselockapi||(f.hasmousecapture=!1,f.haspointerlock=!1);this.delayed=function(d,c,g,e){var f=b.delaylist[d],h=(new Date).getTime();if(!e&&f&&f.tt)return!1;f&&f.tt&&clearTimeout(f.tt);if(f&&f.last+g>h&&!f.tt)b.delaylist[d]={last:h+g,tt:setTimeout(function(){b.delaylist[d].tt=0;c.call()},g)};else if(!f||!f.tt)b.delaylist[d]={last:h,tt:0},setTimeout(function(){c.call()},0)};this.debounced=function(d, -c,g){var f=b.delaylist[d];(new Date).getTime();b.delaylist[d]=c;f||setTimeout(function(){var c=b.delaylist[d];b.delaylist[d]=!1;c.call()},g)};this.synched=function(d,c){b.synclist[d]=c;(function(){b.onsync||(v(function(){b.onsync=!1;for(d in b.synclist){var c=b.synclist[d];c&&c.call(b);b.synclist[d]=!1}}),b.onsync=!0)})();return d};this.unsynched=function(d){b.synclist[d]&&(b.synclist[d]=!1)};this.css=function(d,c){for(var g in c)b.saved.css.push([d,g,d.css(g)]),d.css(g,c[g])};this.scrollTop=function(d){return"undefined"== -typeof d?b.getScrollTop():b.setScrollTop(d)};this.scrollLeft=function(d){return"undefined"==typeof d?b.getScrollLeft():b.setScrollLeft(d)};BezierClass=function(b,c,g,f,e,h,l){this.st=b;this.ed=c;this.spd=g;this.p1=f||0;this.p2=e||1;this.p3=h||0;this.p4=l||1;this.ts=(new Date).getTime();this.df=this.ed-this.st};BezierClass.prototype={B2:function(b){return 3*b*b*(1-b)},B3:function(b){return 3*b*(1-b)*(1-b)},B4:function(b){return(1-b)*(1-b)*(1-b)},getNow:function(){var b=1-((new Date).getTime()-this.ts)/ -this.spd,c=this.B2(b)+this.B3(b)+this.B4(b);return 0>b?this.ed:this.st+Math.round(this.df*c)},update:function(b,c){this.st=this.getNow();this.ed=b;this.spd=c;this.ts=(new Date).getTime();this.df=this.ed-this.st;return this}};if(this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"};f.hastranslate3d&&f.isios&&this.doc.css("-webkit-backface-visibility","hidden");var r=function(){var d=b.doc.css(f.trstyle);return d&&"matrix"==d.substr(0,6)?d.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/): -!1};this.getScrollTop=function(d){if(!d){if(d=r())return 16==d.length?-d[13]:-d[5];if(b.timerscroll&&b.timerscroll.bz)return b.timerscroll.bz.getNow()}return b.doc.translate.y};this.getScrollLeft=function(d){if(!d){if(d=r())return 16==d.length?-d[12]:-d[4];if(b.timerscroll&&b.timerscroll.bh)return b.timerscroll.bh.getNow()}return b.doc.translate.x};this.notifyScrollEvent=document.createEvent?function(b){var c=document.createEvent("UIEvents");c.initUIEvent("scroll",!1,!0,window,1);b.dispatchEvent(c)}: -document.fireEvent?function(b){var c=document.createEventObject();b.fireEvent("onscroll");c.cancelBubble=!0}:function(b,c){};f.hastranslate3d&&b.opt.enabletranslate3d?(this.setScrollTop=function(d,c){b.doc.translate.y=d;b.doc.translate.ty=-1*d+"px";b.doc.css(f.trstyle,"translate3d("+b.doc.translate.tx+","+b.doc.translate.ty+",0px)");c||b.notifyScrollEvent(b.win[0])},this.setScrollLeft=function(d,c){b.doc.translate.x=d;b.doc.translate.tx=-1*d+"px";b.doc.css(f.trstyle,"translate3d("+b.doc.translate.tx+ -","+b.doc.translate.ty+",0px)");c||b.notifyScrollEvent(b.win[0])}):(this.setScrollTop=function(d,c){b.doc.translate.y=d;b.doc.translate.ty=-1*d+"px";b.doc.css(f.trstyle,"translate("+b.doc.translate.tx+","+b.doc.translate.ty+")");c||b.notifyScrollEvent(b.win[0])},this.setScrollLeft=function(d,c){b.doc.translate.x=d;b.doc.translate.tx=-1*d+"px";b.doc.css(f.trstyle,"translate("+b.doc.translate.tx+","+b.doc.translate.ty+")");c||b.notifyScrollEvent(b.win[0])})}else this.getScrollTop=function(){return b.docscroll.scrollTop()}, -this.setScrollTop=function(d){return b.docscroll.scrollTop(d)},this.getScrollLeft=function(){return b.docscroll.scrollLeft()},this.setScrollLeft=function(d){return b.docscroll.scrollLeft(d)};this.getTarget=function(b){return!b?!1:b.target?b.target:b.srcElement?b.srcElement:!1};this.hasParent=function(b,c){if(!b)return!1;for(var g=b.target||b.srcElement||b||!1;g&&g.id!=c;)g=g.parentNode||!1;return!1!==g};var u={thin:1,medium:3,thick:5};this.getOffset=function(){if(b.isfixed)return{top:parseFloat(b.win.css("top")), -left:parseFloat(b.win.css("left"))};if(!b.viewport)return b.win.offset();var d=b.win.offset(),c=b.viewport.offset();return{top:d.top-c.top+b.viewport.scrollTop(),left:d.left-c.left+b.viewport.scrollLeft()}};this.updateScrollBar=function(d){if(b.ishwscroll)b.rail.css({height:b.win.innerHeight()}),b.railh&&b.railh.css({width:b.win.innerWidth()});else{var c=b.getOffset(),g=c.top,f=c.left,g=g+l(b.win,"border-top-width",!0);b.win.outerWidth();b.win.innerWidth();var f=f+(b.rail.align?b.win.outerWidth()- -l(b.win,"border-right-width")-b.rail.width:l(b.win,"border-left-width")),e=b.opt.railoffset;e&&(e.top&&(g+=e.top),b.rail.align&&e.left&&(f+=e.left));b.locked||b.rail.css({top:g,left:f,height:d?d.h:b.win.innerHeight()});b.zoom&&b.zoom.css({top:g+1,left:1==b.rail.align?f-20:f+b.rail.width+4});b.railh&&!b.locked&&(g=c.top,f=c.left,d=b.railh.align?g+l(b.win,"border-top-width",!0)+b.win.innerHeight()-b.railh.height:g+l(b.win,"border-top-width",!0),f+=l(b.win,"border-left-width"),b.railh.css({top:d,left:f, -width:b.railh.width}))}};this.doRailClick=function(d,c,g){var f;b.locked||(b.cancelEvent(d),c?(c=g?b.doScrollLeft:b.doScrollTop,f=g?(d.pageX-b.railh.offset().left-b.cursorwidth/2)*b.scrollratio.x:(d.pageY-b.rail.offset().top-b.cursorheight/2)*b.scrollratio.y,c(f)):(c=g?b.doScrollLeftBy:b.doScrollBy,f=g?b.scroll.x:b.scroll.y,d=g?d.pageX-b.railh.offset().left:d.pageY-b.rail.offset().top,g=g?b.view.w:b.view.h,f>=d?c(g):c(-g)))};b.hasanimationframe=v;b.hascancelanimationframe=w;b.hasanimationframe?b.hascancelanimationframe|| -(w=function(){b.cancelAnimationFrame=!0}):(v=function(b){return setTimeout(b,15-Math.floor(+new Date/1E3)%16)},w=clearInterval);this.init=function(){b.saved.css=[];if(f.isie7mobile)return!0;f.hasmstouch&&b.css(b.ispage?e("html"):b.win,{"-ms-touch-action":"none"});b.zindex="auto";b.zindex=!b.ispage&&"auto"==b.opt.zindex?h()||"auto":b.opt.zindex;!b.ispage&&"auto"!=b.zindex&&b.zindex>x&&(x=b.zindex);b.isie&&(0==b.zindex&&"auto"==b.opt.zindex)&&(b.zindex="auto");if(!b.ispage||!f.cantouch&&!f.isieold&& -!f.isie9mobile){var d=b.docscroll;b.ispage&&(d=b.haswrapper?b.win:b.doc);f.isie9mobile||b.css(d,{"overflow-y":"hidden"});b.ispage&&f.isie7&&("BODY"==b.doc[0].nodeName?b.css(e("html"),{"overflow-y":"hidden"}):"HTML"==b.doc[0].nodeName&&b.css(e("body"),{"overflow-y":"hidden"}));f.isios&&(!b.ispage&&!b.haswrapper)&&b.css(e("body"),{"-webkit-overflow-scrolling":"touch"});var c=e(document.createElement("div"));c.css({position:"relative",top:0,"float":"right",width:b.opt.cursorwidth,height:"0px","background-color":b.opt.cursorcolor, -border:b.opt.cursorborder,"background-clip":"padding-box","-webkit-border-radius":b.opt.cursorborderradius,"-moz-border-radius":b.opt.cursorborderradius,"border-radius":b.opt.cursorborderradius});c.hborder=parseFloat(c.outerHeight()-c.innerHeight());b.cursor=c;var g=e(document.createElement("div"));g.attr("id",b.id);g.addClass("nicescroll-rails");var l,k,n=["left","right"],G;for(G in n)k=n[G],(l=b.opt.railpadding[k])?g.css("padding-"+k,l+"px"):b.opt.railpadding[k]=0;g.append(c);g.width=Math.max(parseFloat(b.opt.cursorwidth), -c.outerWidth())+b.opt.railpadding.left+b.opt.railpadding.right;g.css({width:g.width+"px",zIndex:b.zindex,background:b.opt.background,cursor:"default"});g.visibility=!0;g.scrollable=!0;g.align="left"==b.opt.railalign?0:1;b.rail=g;c=b.rail.drag=!1;b.opt.boxzoom&&(!b.ispage&&!f.isieold)&&(c=document.createElement("div"),b.bind(c,"click",b.doZoom),b.zoom=e(c),b.zoom.css({cursor:"pointer","z-index":b.zindex,backgroundImage:"url("+L+"zoomico.png)",height:18,width:18,backgroundPosition:"0px 0px"}),b.opt.dblclickzoom&& -b.bind(b.win,"dblclick",b.doZoom),f.cantouch&&b.opt.gesturezoom&&(b.ongesturezoom=function(d){1.5d.scale&&b.doZoomOut(d);return b.cancelEvent(d)},b.bind(b.win,"gestureend",b.ongesturezoom)));b.railh=!1;if(b.opt.horizrailenabled){b.css(d,{"overflow-x":"hidden"});c=e(document.createElement("div"));c.css({position:"relative",top:0,height:b.opt.cursorwidth,width:"0px","background-color":b.opt.cursorcolor,border:b.opt.cursorborder,"background-clip":"padding-box","-webkit-border-radius":b.opt.cursorborderradius, -"-moz-border-radius":b.opt.cursorborderradius,"border-radius":b.opt.cursorborderradius});c.wborder=parseFloat(c.outerWidth()-c.innerWidth());b.cursorh=c;var m=e(document.createElement("div"));m.attr("id",b.id+"-hr");m.addClass("nicescroll-rails");m.height=Math.max(parseFloat(b.opt.cursorwidth),c.outerHeight());m.css({height:m.height+"px",zIndex:b.zindex,background:b.opt.background});m.append(c);m.visibility=!0;m.scrollable=!0;m.align="top"==b.opt.railvalign?0:1;b.railh=m;b.railh.drag=!1}b.ispage? -(g.css({position:"fixed",top:"0px",height:"100%"}),g.align?g.css({right:"0px"}):g.css({left:"0px"}),b.body.append(g),b.railh&&(m.css({position:"fixed",left:"0px",width:"100%"}),m.align?m.css({bottom:"0px"}):m.css({top:"0px"}),b.body.append(m))):(b.ishwscroll?("static"==b.win.css("position")&&b.css(b.win,{position:"relative"}),d="HTML"==b.win[0].nodeName?b.body:b.win,b.zoom&&(b.zoom.css({position:"absolute",top:1,right:0,"margin-right":g.width+4}),d.append(b.zoom)),g.css({position:"absolute",top:0}), -g.align?g.css({right:0}):g.css({left:0}),d.append(g),m&&(m.css({position:"absolute",left:0,bottom:0}),m.align?m.css({bottom:0}):m.css({top:0}),d.append(m))):(b.isfixed="fixed"==b.win.css("position"),d=b.isfixed?"fixed":"absolute",b.isfixed||(b.viewport=b.getViewport(b.win[0])),b.viewport&&(b.body=b.viewport,!1==/relative|absolute/.test(b.viewport.css("position"))&&b.css(b.viewport,{position:"relative"})),g.css({position:d}),b.zoom&&b.zoom.css({position:d}),b.updateScrollBar(),b.body.append(g),b.zoom&& -b.body.append(b.zoom),b.railh&&(m.css({position:d}),b.body.append(m))),f.isios&&b.css(b.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),f.isie&&b.opt.disableoutline&&b.win.attr("hideFocus","true"),f.iswebkit&&b.opt.disableoutline&&b.win.css({outline:"none"}));!1===b.opt.autohidemode?(b.autohidedom=!1,b.rail.css({opacity:b.opt.cursoropacitymax}),b.railh&&b.railh.css({opacity:b.opt.cursoropacitymax})):!0===b.opt.autohidemode?(b.autohidedom=e().add(b.rail),f.isie8&& -(b.autohidedom=b.autohidedom.add(b.cursor)),b.railh&&(b.autohidedom=b.autohidedom.add(b.railh)),b.railh&&f.isie8&&(b.autohidedom=b.autohidedom.add(b.cursorh))):"scroll"==b.opt.autohidemode?(b.autohidedom=e().add(b.rail),b.railh&&(b.autohidedom=b.autohidedom.add(b.railh))):"cursor"==b.opt.autohidemode?(b.autohidedom=e().add(b.cursor),b.railh&&(b.autohidedom=b.autohidedom.add(b.cursorh))):"hidden"==b.opt.autohidemode&&(b.autohidedom=!1,b.hide(),b.locked=!1);if(f.isie9mobile)b.scrollmom=new H(b),b.onmangotouch= -function(d){d=b.getScrollTop();var c=b.getScrollLeft();if(d==b.scrollmom.lastscrolly&&c==b.scrollmom.lastscrollx)return!0;var g=d-b.mangotouch.sy,f=c-b.mangotouch.sx;if(0!=Math.round(Math.sqrt(Math.pow(f,2)+Math.pow(g,2)))){var p=0>g?-1:1,e=0>f?-1:1,h=+new Date;b.mangotouch.lazy&&clearTimeout(b.mangotouch.lazy);80s?s=Math.round(s/2):s>b.page.maxh&&(s=b.page.maxh+Math.round((s-b.page.maxh)/2)):(0>s&&(h=s=0),s>b.page.maxh&&(s=b.page.maxh,h=0));if(b.railh&&b.railh.scrollable){var m=b.rail.drag.sl-k;b.ishwscroll&&b.opt.bouncescroll?0>m?m=Math.round(m/2):m>b.page.maxw&&(m=b.page.maxw+ -Math.round((m-b.page.maxw)/2)):(0>m&&(l=m=0),m>b.page.maxw&&(m=b.page.maxw,l=0))}g=!1;if(b.rail.drag.dl)g=!0,"v"==b.rail.drag.dl?m=b.rail.drag.sl:"h"==b.rail.drag.dl&&(s=b.rail.drag.st);else{var p=Math.abs(p),k=Math.abs(k),n=b.opt.directionlockdeadzone;if("v"==b.rail.drag.ck){if(p>n&&k<=0.3*p)return b.rail.drag=!1,!0;k>n&&(b.rail.drag.dl="f",e("body").scrollTop(e("body").scrollTop()))}else if("h"==b.rail.drag.ck){if(k>n&&p<=0.3*az)return b.rail.drag=!1,!0;p>n&&(b.rail.drag.dl="f",e("body").scrollLeft(e("body").scrollLeft()))}}b.synched("touchmove", -function(){b.rail.drag&&2==b.rail.drag.pt&&(b.prepareTransition&&b.prepareTransition(0),b.rail.scrollable&&b.setScrollTop(s),b.scrollmom.update(l,h),b.railh&&b.railh.scrollable?(b.setScrollLeft(m),b.showCursor(s,m)):b.showCursor(s),f.isie10&&document.selection.clear())});f.ischrome&&b.istouchcapable&&(g=!1);if(g)return b.cancelEvent(d)}}}b.onmousedown=function(d,c){if(!(b.rail.drag&&1!=b.rail.drag.pt)){if(b.locked)return b.cancelEvent(d);b.cancelScroll();b.rail.drag={x:d.clientX,y:d.clientY,sx:b.scroll.x, -sy:b.scroll.y,pt:1,hr:!!c};var g=b.getTarget(d);!b.ispage&&f.hasmousecapture&&g.setCapture();b.isiframe&&!f.hasmousecapture&&(b.saved.csspointerevents=b.doc.css("pointer-events"),b.css(b.doc,{"pointer-events":"none"}));return b.cancelEvent(d)}};b.onmouseup=function(d){if(b.rail.drag&&(f.hasmousecapture&&document.releaseCapture(),b.isiframe&&!f.hasmousecapture&&b.doc.css("pointer-events",b.saved.csspointerevents),1==b.rail.drag.pt))return b.rail.drag=!1,b.cancelEvent(d)};b.onmousemove=function(d){if(b.rail.drag&& -1==b.rail.drag.pt){if(f.ischrome&&0==d.which)return b.onmouseup(d);b.cursorfreezed=!0;if(b.rail.drag.hr){b.scroll.x=b.rail.drag.sx+(d.clientX-b.rail.drag.x);0>b.scroll.x&&(b.scroll.x=0);var c=b.scrollvaluemaxw;b.scroll.x>c&&(b.scroll.x=c)}else b.scroll.y=b.rail.drag.sy+(d.clientY-b.rail.drag.y),0>b.scroll.y&&(b.scroll.y=0),c=b.scrollvaluemax,b.scroll.y>c&&(b.scroll.y=c);b.synched("mousemove",function(){b.rail.drag&&1==b.rail.drag.pt&&(b.showCursor(),b.rail.drag.hr?b.doScrollLeft(Math.round(b.scroll.x* -b.scrollratio.x),b.opt.cursordragspeed):b.doScrollTop(Math.round(b.scroll.y*b.scrollratio.y),b.opt.cursordragspeed))});return b.cancelEvent(d)}};if(f.cantouch||b.opt.touchbehavior)b.onpreventclick=function(d){if(b.preventclick)return b.preventclick.tg.onclick=b.preventclick.click,b.preventclick=!1,b.cancelEvent(d)},b.bind(b.win,"mousedown",b.ontouchstart),b.onclick=f.isios?!1:function(d){return b.lastmouseup?(b.lastmouseup=!1,b.cancelEvent(d)):!0},b.opt.grabcursorenabled&&f.cursorgrabvalue&&(b.css(b.ispage? -b.doc:b.win,{cursor:f.cursorgrabvalue}),b.css(b.rail,{cursor:f.cursorgrabvalue}));else{var r=function(d){if(b.selectiondrag){if(d){var c=b.win.outerHeight();d=d.pageY-b.selectiondrag.top;0=c&&(d-=c);b.selectiondrag.df=d}0!=b.selectiondrag.df&&(b.doScrollBy(2*-Math.floor(b.selectiondrag.df/6)),b.debounced("doselectionscroll",function(){r()},50))}};b.hasTextSelected="getSelection"in document?function(){return 0b.page.maxh?b.doScrollTop(b.page.maxh):(b.scroll.y=Math.round(b.getScrollTop()*(1/b.scrollratio.y)), -b.scroll.x=Math.round(b.getScrollLeft()*(1/b.scrollratio.x)),b.cursoractive&&b.noticeCursor());b.scroll.y&&0==b.getScrollTop()&&b.doScrollTo(Math.floor(b.scroll.y*b.scrollratio.y));return b};this.resize=b.onResize;this.lazyResize=function(d){d=isNaN(d)?30:d;b.delayed("resize",b.resize,d);return b};this._bind=function(d,c,g,f){b.events.push({e:d,n:c,f:g,b:f,q:!1});d.addEventListener?d.addEventListener(c,g,f||!1):d.attachEvent?d.attachEvent("on"+c,g):d["on"+c]=g};this.jqbind=function(d,c,g){b.events.push({e:d, -n:c,f:g,q:!0});e(d).bind(c,g)};this.bind=function(d,c,g,e){var h="jquery"in d?d[0]:d;"mousewheel"==c?"onwheel"in b.win?b._bind(h,"wheel",g,e||!1):(d="undefined"!=typeof document.onmousewheel?"mousewheel":"DOMMouseScroll",n(h,d,g,e||!1),"DOMMouseScroll"==d&&n(h,"MozMousePixelScroll",g,e||!1)):h.addEventListener?(f.cantouch&&/mouseup|mousedown|mousemove/.test(c)&&b._bind(h,"mousedown"==c?"touchstart":"mouseup"==c?"touchend":"touchmove",function(b){if(b.touches){if(2>b.touches.length){var d=b.touches.length? -b.touches[0]:b;d.original=b;g.call(this,d)}}else b.changedTouches&&(d=b.changedTouches[0],d.original=b,g.call(this,d))},e||!1),b._bind(h,c,g,e||!1),f.cantouch&&"mouseup"==c&&b._bind(h,"touchcancel",g,e||!1)):b._bind(h,c,function(d){if((d=d||window.event||!1)&&d.srcElement)d.target=d.srcElement;"pageY"in d||(d.pageX=d.clientX+document.documentElement.scrollLeft,d.pageY=d.clientY+document.documentElement.scrollTop);return!1===g.call(h,d)||!1===e?b.cancelEvent(d):!0})};this._unbind=function(b,c,g,f){b.removeEventListener? -b.removeEventListener(c,g,f):b.detachEvent?b.detachEvent("on"+c,g):b["on"+c]=!1};this.unbindAll=function(){for(var d=0;d -(b.newscrolly-h)*(e-h)||0>(b.newscrollx-l)*(c-l))&&b.cancelScroll();!1==b.opt.bouncescroll&&(0>e?e=0:e>b.page.maxh&&(e=b.page.maxh),0>c?c=0:c>b.page.maxw&&(c=b.page.maxw));if(b.scrollrunning&&c==b.newscrollx&&e==b.newscrolly)return!1;b.newscrolly=e;b.newscrollx=c;b.newscrollspeed=g||!1;if(b.timer)return!1;b.timer=setTimeout(function(){var g=b.getScrollTop(),h=b.getScrollLeft(),l,k;l=c-h;k=e-g;l=Math.round(Math.sqrt(Math.pow(l,2)+Math.pow(k,2)));l=b.newscrollspeed&&1=b.newscrollspeed&&(l*=b.newscrollspeed);b.prepareTransition(l,!0);b.timerscroll&&b.timerscroll.tm&&clearInterval(b.timerscroll.tm);0c?c=0:c>b.page.maxh&&(c=b.page.maxh);0>e?e=0:e>b.page.maxw&&(e=b.page.maxw);if(c!=b.newscrolly||e!=b.newscrollx)return b.doScrollPos(e,c,b.opt.snapbackspeed);b.onscrollend&&b.scrollrunning&&b.onscrollend.call(b,{type:"scrollend",current:{x:e,y:c},end:{x:b.newscrollx,y:b.newscrolly}});b.scrollrunning= -!1}):(this.doScrollLeft=function(c,f){var g=b.scrollrunning?b.newscrolly:b.getScrollTop();b.doScrollPos(c,g,f)},this.doScrollTop=function(c,f){var g=b.scrollrunning?b.newscrollx:b.getScrollLeft();b.doScrollPos(g,c,f)},this.doScrollPos=function(c,f,g){function e(){if(b.cancelAnimationFrame)return!0;b.scrollrunning=!0;if(r=1-r)return b.timer=v(e)||1;var c=0,d=sy=b.getScrollTop();if(b.dst.ay){var d=b.bzscroll?b.dst.py+b.bzscroll.getNow()*b.dst.ay:b.newscrolly,g=d-sy;if(0>g&&db.newscrolly)d= -b.newscrolly;b.setScrollTop(d);d==b.newscrolly&&(c=1)}else c=1;var f=sx=b.getScrollLeft();if(b.dst.ax){f=b.bzscroll?b.dst.px+b.bzscroll.getNow()*b.dst.ax:b.newscrollx;g=f-sx;if(0>g&&fb.newscrollx)f=b.newscrollx;b.setScrollLeft(f);f==b.newscrollx&&(c+=1)}else c+=1;2==c?(b.timer=0,b.cursorfreezed=!1,b.bzscroll=!1,b.scrollrunning=!1,0>d?d=0:d>b.page.maxh&&(d=b.page.maxh),0>f?f=0:f>b.page.maxw&&(f=b.page.maxw),f!=b.newscrollx||d!=b.newscrolly?b.doScrollPos(f,d):b.onscrollend&&b.onscrollend.call(b, -{type:"scrollend",current:{x:sx,y:sy},end:{x:b.newscrollx,y:b.newscrolly}})):b.timer=v(e)||1}f="undefined"==typeof f||!1===f?b.getScrollTop(!0):f;if(b.timer&&b.newscrolly==f&&b.newscrollx==c)return!0;b.timer&&w(b.timer);b.timer=0;var h=b.getScrollTop(),l=b.getScrollLeft();(0>(b.newscrolly-h)*(f-h)||0>(b.newscrollx-l)*(c-l))&&b.cancelScroll();b.newscrolly=f;b.newscrollx=c;if(!b.bouncescroll||!b.rail.visibility)0>b.newscrolly?b.newscrolly=0:b.newscrolly>b.page.maxh&&(b.newscrolly=b.page.maxh);if(!b.bouncescroll|| -!b.railh.visibility)0>b.newscrollx?b.newscrollx=0:b.newscrollx>b.page.maxw&&(b.newscrollx=b.page.maxw);b.dst={};b.dst.x=c-l;b.dst.y=f-h;b.dst.px=l;b.dst.py=h;var k=Math.round(Math.sqrt(Math.pow(b.dst.x,2)+Math.pow(b.dst.y,2)));b.dst.ax=b.dst.x/k;b.dst.ay=b.dst.y/k;var n=0,q=k;0==b.dst.x?(n=h,q=f,b.dst.ay=1,b.dst.py=0):0==b.dst.y&&(n=l,q=c,b.dst.ax=1,b.dst.px=0);k=b.getTransitionSpeed(k);g&&1>=g&&(k*=g);b.bzscroll=0=b.page.maxh||l==b.page.maxw&&c>=b.page.maxw)&&b.checkContentSize();var r=1;b.cancelAnimationFrame=!1;b.timer=1;b.onscrollstart&&!b.scrollrunning&&b.onscrollstart.call(b,{type:"scrollstart",current:{x:l,y:h},request:{x:c,y:f},end:{x:b.newscrollx,y:b.newscrolly},speed:k});e();(h==b.page.maxh&&f>=h||l==b.page.maxw&&c>=l)&&b.checkContentSize();b.noticeCursor()}},this.cancelScroll=function(){b.timer&&w(b.timer);b.timer=0;b.bzscroll=!1;b.scrollrunning=!1;return b}):(this.doScrollLeft=function(c, -f){var g=b.getScrollTop();b.doScrollPos(c,g,f)},this.doScrollTop=function(c,f){var g=b.getScrollLeft();b.doScrollPos(g,c,f)},this.doScrollPos=function(c,f,g){var e=c>b.page.maxw?b.page.maxw:c;0>e&&(e=0);var h=f>b.page.maxh?b.page.maxh:f;0>h&&(h=0);b.synched("scroll",function(){b.setScrollTop(h);b.setScrollLeft(e)})},this.cancelScroll=function(){});this.doScrollBy=function(c,f){var g=0,g=f?Math.floor((b.scroll.y-c)*b.scrollratio.y):(b.timer?b.newscrolly:b.getScrollTop(!0))-c;if(b.bouncescroll){var e= -Math.round(b.view.h/2);g<-e?g=-e:g>b.page.maxh+e&&(g=b.page.maxh+e)}b.cursorfreezed=!1;py=b.getScrollTop(!0);if(0>g&&0>=py)return b.noticeCursor();if(g>b.page.maxh&&py>=b.page.maxh)return b.checkContentSize(),b.noticeCursor();b.doScrollTop(g)};this.doScrollLeftBy=function(c,f){var g=0,g=f?Math.floor((b.scroll.x-c)*b.scrollratio.x):(b.timer?b.newscrollx:b.getScrollLeft(!0))-c;if(b.bouncescroll){var e=Math.round(b.view.w/2);g<-e?g=-e:g>b.page.maxw+e&&(g=b.page.maxw+e)}b.cursorfreezed=!1;px=b.getScrollLeft(!0); -if(0>g&&0>=px||g>b.page.maxw&&px>=b.page.maxw)return b.noticeCursor();b.doScrollLeft(g)};this.doScrollTo=function(c,f){f&&Math.round(c*b.scrollratio.y);b.cursorfreezed=!1;b.doScrollTop(c)};this.checkContentSize=function(){var c=b.getContentSize();(c.h!=b.page.h||c.w!=b.page.w)&&b.resize(!1,c)};b.onscroll=function(c){b.rail.drag||b.cursorfreezed||b.synched("scroll",function(){b.scroll.y=Math.round(b.getScrollTop()*(1/b.scrollratio.y));b.railh&&(b.scroll.x=Math.round(b.getScrollLeft()*(1/b.scrollratio.x))); -b.noticeCursor()})};b.bind(b.docscroll,"scroll",b.onscroll);this.doZoomIn=function(c){if(!b.zoomactive){b.zoomactive=!0;b.zoomrestore={style:{}};var h="position top left zIndex backgroundColor marginTop marginBottom marginLeft marginRight".split(" "),g=b.win[0].style,l;for(l in h){var k=h[l];b.zoomrestore.style[k]="undefined"!=typeof g[k]?g[k]:""}b.zoomrestore.style.width=b.win.css("width");b.zoomrestore.style.height=b.win.css("height");b.zoomrestore.padding={w:b.win.outerWidth()-b.win.width(),h:b.win.outerHeight()- -b.win.height()};f.isios4&&(b.zoomrestore.scrollTop=e(window).scrollTop(),e(window).scrollTop(0));b.win.css({position:f.isios4?"absolute":"fixed",top:0,left:0,"z-index":x+100,margin:"0px"});h=b.win.css("backgroundColor");(""==h||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(h))&&b.win.css("backgroundColor","#fff");b.rail.css({"z-index":x+101});b.zoom.css({"z-index":x+102});b.zoom.css("backgroundPosition","0px -18px");b.resizeZoom();b.onzoomin&&b.onzoomin.call(b);return b.cancelEvent(c)}};this.doZoomOut= -function(c){if(b.zoomactive)return b.zoomactive=!1,b.win.css("margin",""),b.win.css(b.zoomrestore.style),f.isios4&&e(window).scrollTop(b.zoomrestore.scrollTop),b.rail.css({"z-index":b.zindex}),b.zoom.css({"z-index":b.zindex}),b.zoomrestore=!1,b.zoom.css("backgroundPosition","0px 0px"),b.onResize(),b.onzoomout&&b.onzoomout.call(b),b.cancelEvent(c)};this.doZoom=function(c){return b.zoomactive?b.doZoomOut(c):b.doZoomIn(c)};this.resizeZoom=function(){if(b.zoomactive){var c=b.getScrollTop();b.win.css({width:e(window).width()- -b.zoomrestore.padding.w+"px",height:e(window).height()-b.zoomrestore.padding.h+"px"});b.onResize();b.setScrollTop(Math.min(b.page.maxh,c))}};this.init();e.nicescroll.push(this)},H=function(e){var c=this;this.nc=e;this.steptime=this.lasttime=this.speedy=this.speedx=this.lasty=this.lastx=0;this.snapy=this.snapx=!1;this.demuly=this.demulx=0;this.lastscrolly=this.lastscrollx=-1;this.timer=this.chky=this.chkx=0;this.time=function(){return+new Date};this.reset=function(e,l){c.stop();var k=c.time();c.steptime= -0;c.lasttime=k;c.speedx=0;c.speedy=0;c.lastx=e;c.lasty=l;c.lastscrollx=-1;c.lastscrolly=-1};this.update=function(e,l){var k=c.time();c.steptime=k-c.lasttime;c.lasttime=k;var k=l-c.lasty,t=e-c.lastx,b=c.nc.getScrollTop(),q=c.nc.getScrollLeft(),b=b+k,q=q+t;c.snapx=0>q||q>c.nc.page.maxw;c.snapy=0>b||b>c.nc.page.maxh;c.speedx=t;c.speedy=k;c.lastx=e;c.lasty=l};this.stop=function(){c.nc.unsynched("domomentum2d");c.timer&&clearTimeout(c.timer);c.timer=0;c.lastscrollx=-1;c.lastscrolly=-1};this.doSnapy=function(e, -l){var k=!1;0>l?(l=0,k=!0):l>c.nc.page.maxh&&(l=c.nc.page.maxh,k=!0);0>e?(e=0,k=!0):e>c.nc.page.maxw&&(e=c.nc.page.maxw,k=!0);k&&c.nc.doScrollPos(e,l,c.nc.opt.snapbackspeed)};this.doMomentum=function(e){var l=c.time(),k=e?l+e:c.lasttime;e=c.nc.getScrollLeft();var t=c.nc.getScrollTop(),b=c.nc.page.maxh,q=c.nc.page.maxw;c.speedx=0=l-k;if(0>t||t>b||0>e||e>q)k=!1;e=c.speedx&&k?c.speedx:!1;if(c.speedy&&k&&c.speedy||e){var f=Math.max(16, -c.steptime);50r||r>q))e=0.1;if(c.speedy&&(u=Math.floor(c.lastscrolly-c.speedy*(1-c.demulxy)),c.lastscrolly=u,0>u||u>b))e=0.1;c.demulxy=Math.min(1,c.demulxy+e);c.nc.synched("domomentum2d", -function(){c.speedx&&(c.nc.getScrollLeft()!=c.chkx&&c.stop(),c.chkx=r,c.nc.setScrollLeft(r));c.speedy&&(c.nc.getScrollTop()!=c.chky&&c.stop(),c.chky=u,c.nc.setScrollTop(u));c.timer||(c.nc.hideCursor(),c.doSnapy(r,u))});1>c.demulxy?c.timer=setTimeout(d,f):(c.stop(),c.nc.hideCursor(),c.doSnapy(r,u))};d()}else c.doSnapy(c.nc.getScrollLeft(),c.nc.getScrollTop())}},A=e.fn.scrollTop;e.cssHooks.pageYOffset={get:function(k,c,h){return(c=e.data(k,"__nicescroll")||!1)&&c.ishwscroll?c.getScrollTop():A.call(k)}, -set:function(k,c){var h=e.data(k,"__nicescroll")||!1;h&&h.ishwscroll?h.setScrollTop(parseInt(c)):A.call(k,c);return this}};e.fn.scrollTop=function(k){if("undefined"==typeof k){var c=this[0]?e.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollTop():A.call(this)}return this.each(function(){var c=e.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollTop(parseInt(k)):A.call(e(this),k)})};var B=e.fn.scrollLeft;e.cssHooks.pageXOffset={get:function(k,c,h){return(c=e.data(k,"__nicescroll")|| -!1)&&c.ishwscroll?c.getScrollLeft():B.call(k)},set:function(k,c){var h=e.data(k,"__nicescroll")||!1;h&&h.ishwscroll?h.setScrollLeft(parseInt(c)):B.call(k,c);return this}};e.fn.scrollLeft=function(k){if("undefined"==typeof k){var c=this[0]?e.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollLeft():B.call(this)}return this.each(function(){var c=e.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollLeft(parseInt(k)):B.call(e(this),k)})};var C=function(k){var c=this;this.length= -0;this.name="nicescrollarray";this.each=function(e){for(var h=0;h Date: Fri, 8 Apr 2016 20:39:32 +0800 Subject: [PATCH 5/7] Clean messy commenting --- production/js/custom.js | 60 ++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/production/js/custom.js b/production/js/custom.js index 7757e7d..cf76fc0 100755 --- a/production/js/custom.js +++ b/production/js/custom.js @@ -1,10 +1,10 @@ -/* +/** * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ -/** ****** left menu *********************** **/ +// Sidebar $(function () { $('#sidebar-menu li ul').slideUp(); $('#sidebar-menu li').removeClass('active'); @@ -48,7 +48,7 @@ $(function () { }); }); -/* Sidebar Menu active class */ +// Sidebar Menu active class $(function () { var url = window.location; $('#sidebar-menu a[href="' + url + '"]').parent('li').addClass('current-page'); @@ -57,27 +57,24 @@ $(function () { }).parent('li').addClass('current-page').parent('ul').slideDown().parent().addClass('active'); }); -/** ****** /left menu *********************** **/ -/** ****** right_col height flexible *********************** **/ + +// Right column height $(".right_col").css("min-height", $(window).height()); $(window).resize(function () { $(".right_col").css("min-height", $(window).height()); }); -/** ****** /right_col height flexible *********************** **/ - - -/** ****** tooltip *********************** **/ +// Tooltip $(function () { - $('[data-toggle="tooltip"]').tooltip() -}) -/** ****** /tooltip *********************** **/ -/** ****** progressbar *********************** **/ + $('[data-toggle="tooltip"]').tooltip(); +}); + +// Progressbar if ($(".progress .progress-bar")[0]) { $('.progress .progress-bar').progressbar(); // bootstrap 3 } -/** ****** /progressbar *********************** **/ -/** ****** switchery *********************** **/ + +// Switchery if ($(".js-switch")[0]) { var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch')); elems.forEach(function (html) { @@ -86,8 +83,7 @@ if ($(".js-switch")[0]) { }); }); } -/** ****** /switcher *********************** **/ -/** ****** collapse panel *********************** **/ + // Close ibox function $('.close-link').click(function () { var content = $(this).closest('div.x_panel'); @@ -107,8 +103,8 @@ $('.collapse-link').click(function () { x_panel.resize(); }, 50); }); -/** ****** /collapse panel *********************** **/ -/** ****** iswitch *********************** **/ + +// iCheck if ($("input.flat")[0]) { $(document).ready(function () { $('input.flat').iCheck({ @@ -117,9 +113,8 @@ if ($("input.flat")[0]) { }); }); } -/** ****** /iswitch *********************** **/ -/** ****** star rating *********************** **/ -// Starrr plugin (https://github.com/dobtco/starrr) + +// Starrr var __slice = [].slice; (function ($, window) { @@ -142,7 +137,7 @@ var __slice = [].slice; _ref = this.defaults; for (i in _ref) { _ = _ref[i]; - if (this.$el.data(i) != null) { + if (this.$el.data(i) !== null) { this.options[i] = this.$el.data(i); } } @@ -237,8 +232,8 @@ $(document).ready(function () { }); }); -/** ****** /star rating *********************** **/ -/** ****** table *********************** **/ + +// Table $('table input').on('ifChecked', function () { check_state = ''; $(this).parent().parent().parent().addClass('selected'); @@ -287,15 +282,8 @@ function countChecked() { $('.bulk-actions').hide(); } } -/** ****** /table *********************** **/ -/** ****** *********************** **/ -/** ****** *********************** **/ -/** ****** *********************** **/ -/** ****** *********************** **/ -/** ****** *********************** **/ -/** ****** *********************** **/ -/** ****** Accordion *********************** **/ +// Accordion $(function () { $(".expand").on("click", function () { $(this).next().slideToggle(200); @@ -309,9 +297,8 @@ $(function () { }); }); -/** ****** Accordion *********************** **/ -/** ****** NProgress *********************** **/ +// NProgress if (typeof NProgress != 'undefined') { $(document).ready(function () { NProgress.start(); @@ -320,5 +307,4 @@ if (typeof NProgress != 'undefined') { $(window).load(function () { NProgress.done(); }); -} -/** ****** NProgress *********************** **/ \ No newline at end of file +} \ No newline at end of file From f18c581141cc6bbf72dbc261fc1927c118c7c034 Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 20:39:51 +0800 Subject: [PATCH 6/7] Remove nicescroll this is not working since the beginning --- production/map.html | 1 - production/media_gallery.html | 1 - production/morisjs.html | 1 - production/other_charts.html | 1 - production/page_404.html | 1 - production/page_500.html | 1 - production/plain_page.html | 1 - production/pricing_tables.html | 1 - production/profile.html | 1 - production/project_detail.html | 1 - production/projects.html | 1 - production/sign_up.html | 1 - production/tables.html | 1 - production/tables_dynamic.html | 1 - production/typography.html | 1 - production/widgets.html | 1 - 16 files changed, 16 deletions(-) diff --git a/production/map.html b/production/map.html index 0ae0544..c1a4451 100755 --- a/production/map.html +++ b/production/map.html @@ -1405,7 +1405,6 @@ - diff --git a/production/media_gallery.html b/production/media_gallery.html index 8aa51f4..67399d9 100755 --- a/production/media_gallery.html +++ b/production/media_gallery.html @@ -588,7 +588,6 @@ - diff --git a/production/morisjs.html b/production/morisjs.html index 035d4f9..5dcc562 100755 --- a/production/morisjs.html +++ b/production/morisjs.html @@ -530,7 +530,6 @@ - diff --git a/production/other_charts.html b/production/other_charts.html index 549e3d6..f4c75a1 100755 --- a/production/other_charts.html +++ b/production/other_charts.html @@ -508,7 +508,6 @@ - diff --git a/production/page_404.html b/production/page_404.html index c14e036..23bbc17 100755 --- a/production/page_404.html +++ b/production/page_404.html @@ -84,7 +84,6 @@ - diff --git a/production/page_500.html b/production/page_500.html index 6caab3a..eefda67 100755 --- a/production/page_500.html +++ b/production/page_500.html @@ -84,7 +84,6 @@ - diff --git a/production/plain_page.html b/production/plain_page.html index 30e7768..2d4c703 100755 --- a/production/plain_page.html +++ b/production/plain_page.html @@ -391,7 +391,6 @@ - diff --git a/production/pricing_tables.html b/production/pricing_tables.html index c28f7e0..5a5c8f6 100755 --- a/production/pricing_tables.html +++ b/production/pricing_tables.html @@ -537,7 +537,6 @@ - diff --git a/production/profile.html b/production/profile.html index dd2a35a..e490d1e 100755 --- a/production/profile.html +++ b/production/profile.html @@ -693,7 +693,6 @@ - diff --git a/production/project_detail.html b/production/project_detail.html index ae891f5..8e39e65 100755 --- a/production/project_detail.html +++ b/production/project_detail.html @@ -528,7 +528,6 @@ - diff --git a/production/projects.html b/production/projects.html index 3f1e165..156f47b 100755 --- a/production/projects.html +++ b/production/projects.html @@ -734,7 +734,6 @@ - diff --git a/production/sign_up.html b/production/sign_up.html index 4fcd21f..aa05783 100755 --- a/production/sign_up.html +++ b/production/sign_up.html @@ -295,7 +295,6 @@ - diff --git a/production/tables.html b/production/tables.html index 51d18cd..65b239d 100755 --- a/production/tables.html +++ b/production/tables.html @@ -800,7 +800,6 @@ - diff --git a/production/tables_dynamic.html b/production/tables_dynamic.html index 2191290..30ec4fc 100755 --- a/production/tables_dynamic.html +++ b/production/tables_dynamic.html @@ -3062,7 +3062,6 @@ - diff --git a/production/typography.html b/production/typography.html index 79fb1ff..6f6b8cf 100755 --- a/production/typography.html +++ b/production/typography.html @@ -430,7 +430,6 @@ - diff --git a/production/widgets.html b/production/widgets.html index 38c96aa..e075b39 100755 --- a/production/widgets.html +++ b/production/widgets.html @@ -964,7 +964,6 @@ - From b10d662bfd10a174c062576f96e127696389f592 Mon Sep 17 00:00:00 2001 From: christianesperar Date: Fri, 8 Apr 2016 20:57:31 +0800 Subject: [PATCH 7/7] Fix mispelling of calendar --- documentation/index.html | 2 +- documentation/index_cn.html | 2 +- production/{calender.html => calendar.html} | 14 +++++++------- production/chartjs.html | 2 +- production/chartjs2.html | 2 +- production/contacts.html | 2 +- production/e_commerce.html | 2 +- production/echarts.html | 2 +- production/form.html | 2 +- production/form_advanced.html | 2 +- production/form_buttons.html | 2 +- production/form_upload.html | 2 +- production/form_validation.html | 2 +- production/form_wizards.html | 2 +- production/general_elements.html | 2 +- production/glyphicons.html | 2 +- production/icons.html | 2 +- production/inbox.html | 2 +- production/index.html | 2 +- production/index2.html | 2 +- production/index3.html | 2 +- production/invoice.html | 2 +- production/map.html | 2 +- production/media_gallery.html | 2 +- production/morisjs.html | 2 +- production/other_charts.html | 2 +- production/plain_page.html | 2 +- production/pricing_tables.html | 2 +- production/profile.html | 2 +- production/project_detail.html | 2 +- production/projects.html | 2 +- production/sign_up.html | 2 +- production/tables.html | 2 +- production/tables_dynamic.html | 2 +- production/typography.html | 2 +- production/widgets.html | 2 +- 36 files changed, 42 insertions(+), 42 deletions(-) rename production/{calender.html => calendar.html} (98%) diff --git a/documentation/index.html b/documentation/index.html index df86777..028814f 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -230,7 +230,7 @@
  • Widgets
  • Invoice
  • Inbox
    • -
  • Calender
    • +
  • Calendar
  • Tables diff --git a/documentation/index_cn.html b/documentation/index_cn.html index 76a4798..8f96dd6 100644 --- a/documentation/index_cn.html +++ b/documentation/index_cn.html @@ -264,7 +264,7 @@
  • Widgets
  • Invoice
  • Inbox
    • -
  • Calender
    • +
  • Calendar
  • Tables diff --git a/production/calender.html b/production/calendar.html similarity index 98% rename from production/calender.html rename to production/calendar.html index 40dc6a9..ecd29ba 100755 --- a/production/calender.html +++ b/production/calendar.html @@ -119,7 +119,7 @@
  • Inbox
    • -
  • Calender +
  • Calendar
    • @@ -318,7 +318,7 @@

    - Calender + Calendar Click to add/edit events @@ -342,7 +342,7 @@
    -

    Calender Events Sessions

    +

    Calendar Events Sessions

      • @@ -383,14 +383,14 @@
    - +