This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.7 by this push:
new da10af8 ACCUMULO-4741 Remove minified files in Monitor
da10af8 is described below
commit da10af8d0c9da5e40b61a17976b29f826a818c27
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri Jan 19 13:11:10 2018 -0500
ACCUMULO-4741 Remove minified files in Monitor
---
.../accumulo/monitor/servlets/BasicServlet.java | 2 +-
.../src/main/resources/web/flot/excanvas.min.js | 1 -
.../resources/web/flot/jquery.colorhelpers.min.js | 1 -
.../web/flot/jquery.flot.crosshair.min.js | 1 -
.../web/flot/jquery.flot.fillbetween.min.js | 1 -
.../resources/web/flot/jquery.flot.image.min.js | 1 -
.../src/main/resources/web/flot/jquery.flot.min.js | 6 ------
.../resources/web/flot/jquery.flot.navigate.min.js | 1 -
.../main/resources/web/flot/jquery.flot.pie.min.js | 1 -
.../resources/web/flot/jquery.flot.resize.min.js | 1 -
.../web/flot/jquery.flot.selection.min.js | 1 -
.../resources/web/flot/jquery.flot.stack.min.js | 1 -
.../resources/web/flot/jquery.flot.symbol.min.js | 1 -
.../web/flot/jquery.flot.threshold.min.js | 1 -
.../src/main/resources/web/flot/jquery.min.js | 23 ----------------------
15 files changed, 1 insertion(+), 42 deletions(-)
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
index 8168ce7..e517b44 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
@@ -137,7 +137,7 @@ abstract public class BasicServlet extends HttpServlet {
sb.append("<link rel='stylesheet' type='text/css' href='/web/screen.css'
media='screen' />\n");
sb.append("<script src='/web/functions.js'
type='text/javascript'></script>\n");
- sb.append("<!--[if lte IE 8]><script language=\"javascript\"
type=\"text/javascript\"
src=\"/web/flot/excanvas.min.js\"></script><![endif]-->\n");
+ sb.append("<!--[if lte IE 8]><script language=\"javascript\"
type=\"text/javascript\"
src=\"/web/flot/excanvas.js\"></script><![endif]-->\n");
sb.append("<script language=\"javascript\" type=\"text/javascript\"
src=\"/web/flot/jquery.js\"></script>\n");
sb.append("<script language=\"javascript\" type=\"text/javascript\"
src=\"/web/flot/jquery.flot.js\"></script>\n");
diff --git a/server/monitor/src/main/resources/web/flot/excanvas.min.js
b/server/monitor/src/main/resources/web/flot/excanvas.min.js
deleted file mode 100644
index 988f934..0000000
--- a/server/monitor/src/main/resources/web/flot/excanvas.min.js
+++ /dev/null
@@ -1 +0,0 @@
-if(!document.createElement("canvas").getContext){(function(){var z=Math;var
K=z.round;var J=z.sin;var U=z.cos;var b=z.abs;var k=z.sqrt;var D=10;var
F=D/2;function T(){return this.context_||(this.context_=new W(this))}var
O=Array.prototype.slice;function G(i,j,m){var Z=O.call(arguments,2);return
function(){return i.apply(j,Z.concat(O.call(arguments)))}}function AD(Z){return
String(Z).replace(/&/g,"&").replace(/"/g,""")}function
r(i){if(!i.namespaces.g_vml_){i.namespaces.add("g_vm [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
b/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
deleted file mode 100644
index 7082b11..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.colorhelpers.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.color={};b.color.make=function(f,e,c,d){var
h={};h.r=f||0;h.g=e||0;h.b=c||0;h.a=d!=null?d:1;h.add=function(k,j){for(var
g=0;g<k.length;++g){h[k.charAt(g)]+=j}return
h.normalize()};h.scale=function(k,j){for(var
g=0;g<k.length;++g){h[k.charAt(g)]*=j}return
h.normalize()};h.toString=function(){if(h.a>=1){return"rgb("+[h.r,h.g,h.b].join(",")+")"}else{return"rgba("+[h.r,h.g,h.b,h.a].join(",")+")"}};h.normalize=function(){function
g(j,k,i){return k<j?j:(k>i?i:k)}h.r=g(0,parseInt [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
deleted file mode 100644
index bdd6da4..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.crosshair.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){var a={crosshair:{mode:null,color:"rgba(170, 0, 0,
0.80)",lineWidth:1}};function c(h){var
j={x:-1,y:-1,locked:false};h.setCrosshair=function e(l){if(!l){j.x=-1}else{var
k=h.p2c(l);j.x=Math.max(0,Math.min(k.left,h.width()));j.y=Math.max(0,Math.min(k.top,h.height()))}h.triggerRedrawOverlay()};h.clearCrosshair=h.setCrosshair;h.lockCrosshair=function
f(k){if(k){h.setCrosshair(k)}j.locked=true};h.unlockCrosshair=function
g(){j.locked=false};function d(k){if(j.locked){return}if(j. [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
deleted file mode 100644
index 6ebcdcc..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.fillbetween.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){var a={series:{fillBetween:null}};function c(f){function
d(j,h){var g;for(g=0;g<h.length;++g){if(h[g].id==j.fillBetween){return
h[g]}}if(typeof
j.fillBetween=="number"){g=j.fillBetween;if(g<0||g>=h.length){return
null}return h[g]}return null}function
e(B,u,g){if(u.fillBetween==null){return}var
p=d(u,B.getData());if(!p){return}var
y=g.pointsize,E=g.points,h=p.datapoints.pointsize,x=p.datapoints.points,r=[],w,v,k,G,F,q,t=u.lines.show,o=y>2&&g.format[2].y,n=t&&u.lines.steps,D=t
[...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.image.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.image.min.js
deleted file mode 100644
index 2e6af1e..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.image.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(c){var
a={series:{images:{show:false,alpha:1,anchor:"corner"}}};c.plot.image={};c.plot.image.loadDataImages=function(g,f,k){var
j=[],h=[];var
i=f.series.images.show;c.each(g,function(l,m){if(!(i||m.images.show)){return}if(m.data){m=m.data}c.each(m,function(n,o){if(typeof
o[0]=="string"){j.push(o[0]);h.push(o)}})});c.plot.image.load(j,function(l){c.each(h,function(n,o){var
m=o[0];if(l[m]){o[0]=l[m]}});k()})};c.plot.image.load=function(h,i){var
g=h.length,f={};if(g==0){i({})}c.ea [...]
diff --git a/server/monitor/src/main/resources/web/flot/jquery.flot.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.min.js
deleted file mode 100644
index 371e168..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Javascript plotting library for jQuery, v. 0.7.
- *
- * Released under the MIT license by IOLA, December 2007.
- *
- */
-(function(b){b.color={};b.color.make=function(d,e,g,f){var
c={};c.r=d||0;c.g=e||0;c.b=g||0;c.a=f!=null?f:1;c.add=function(h,j){for(var
k=0;k<h.length;++k){c[h.charAt(k)]+=j}return
c.normalize()};c.scale=function(h,j){for(var
k=0;k<h.length;++k){c[h.charAt(k)]*=j}return
c.normalize()};c.toString=function(){if(c.a>=1){return"rgb("+[c.r,c.g,c.b].join(",")+")"}else{return"rgba("+[c.r,c.g,c.b,c.a].join(",")+")"}};c.normalize=function(){function
h(k,j,l){return j<k?k:(j>l?l:j)}c.r=h(0,parseInt [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.navigate.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.navigate.min.js
deleted file mode 100644
index a4fb84e..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.navigate.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(i){i.fn.drag=function(j,k,l){if(k){this.bind("dragstart",j)}if(l){this.bind("dragend",l)}return
!j?this.trigger("drag"):this.bind("drag",k?k:j)};var
d=i.event,c=d.special,h=c.drag={not:":input",distance:0,which:1,dragging:false,setup:function(j){j=i.extend({distance:h.distance,which:h.which,not:h.not},j||{});j.distance=e(j.distance);d.add(this,"mousedown",f,j);if(this.attachEvent){this.attachEvent("ondragstart",a)}},teardown:function(){d.remove(this,"mousedown",f);if(this===h.d
[...]
diff --git a/server/monitor/src/main/resources/web/flot/jquery.flot.pie.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.pie.min.js
deleted file mode 100644
index 2fd4fc1..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.pie.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){function c(D){var h=null;var L=null;var n=null;var B=null;var
p=null;var M=0;var F=true;var o=10;var w=0.95;var A=0;var d=false;var
z=false;var
j=[];D.hooks.processOptions.push(g);D.hooks.bindEvents.push(e);function
g(O,N){if(N.series.pie.show){N.grid.show=false;if(N.series.pie.label.show=="auto"){if(N.legend.show){N.series.pie.label.show=false}else{N.series.pie.label.show=true}}if(N.series.pie.radius=="auto"){if(N.series.pie.label.show){N.series.pie.radius=3/4}else{N.series
[...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.resize.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.resize.min.js
deleted file mode 100644
index f81015a..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.resize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(n,p,u){var
w=n([]),s=n.resize=n.extend(n.resize,{}),o,l="setTimeout",m="resize",t=m+"-special-event",v="delay",r="throttleWindow";s[v]=250;s[r]=true;n.event.special[m]={setup:function(){if(!s[r]&&this[l]){return
false}var
a=n(this);w=w.add(a);n.data(this,t,{w:a.width(),h:a.height()});if(w.length===1){q()}},teardown:function(){if(!s[r]&&this[l]){return
false}var
a=n(this);w=w.not(a);a.removeData(t);if(!w.length){clearTimeout(o)}},add:function(b){if(!s[r]&&this[l]){return
false}v [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.selection.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.selection.min.js
deleted file mode 100644
index c86a62f..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.selection.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){function b(k){var
p={first:{x:-1,y:-1},second:{x:-1,y:-1},show:false,active:false};var m={};var
r=null;function
e(s){if(p.active){l(s);k.getPlaceholder().trigger("plotselecting",[g()])}}function
n(s){if(s.which!=1){return}document.body.focus();if(document.onselectstart!==undefined&&m.onselectstart==null){m.onselectstart=document.onselectstart;document.onselectstart=function(){return
false}}if(document.ondrag!==undefined&&m.ondrag==null){m.ondrag=document.ondrag;document.ondr
[...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.stack.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.stack.min.js
deleted file mode 100644
index 1d645b7..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.stack.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){var a={series:{stack:null}};function c(f){function d(k,j){var
h=null;for(var
g=0;g<j.length;++g){if(k==j[g]){break}if(j[g].stack==k.stack){h=j[g]}}return
h}function e(C,v,g){if(v.stack==null){return}var
p=d(v,C.getData());if(!p){return}var
z=g.pointsize,F=g.points,h=p.datapoints.pointsize,y=p.datapoints.points,t=[],x,w,k,J,I,r,u=v.lines.show,G=v.bars.horizontal,o=z>2&&(G?g.format[2].x:g.format[2].y),n=u&&v.lines.steps,E=true,q=G?1:0,H=G?0:1,D=0,B=0,A;while(true){if(D>=F.leng
[...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.symbol.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.symbol.min.js
deleted file mode 100644
index 2a75f4a..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.symbol.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){function a(h,e,g){var d={square:function(k,j,n,i,m){var
l=i*Math.sqrt(Math.PI)/2;k.rect(j-l,n-l,l+l,l+l)},diamond:function(k,j,n,i,m){var
l=i*Math.sqrt(Math.PI/2);k.moveTo(j-l,n);k.lineTo(j,n-l);k.lineTo(j+l,n);k.lineTo(j,n+l);k.lineTo(j-l,n)},triangle:function(l,k,o,j,n){var
m=j*Math.sqrt(2*Math.PI/Math.sin(Math.PI/3));var
i=m*Math.sin(Math.PI/3);l.moveTo(k-m/2,o+i/2);l.lineTo(k+m/2,o+i/2);if(!n){l.lineTo(k,o-i/2);l.lineTo(k-m/2,o+i/2)}},cross:function(k,j,n,i,m){var
l=i*Ma [...]
diff --git
a/server/monitor/src/main/resources/web/flot/jquery.flot.threshold.min.js
b/server/monitor/src/main/resources/web/flot/jquery.flot.threshold.min.js
deleted file mode 100644
index a96ff4d..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.flot.threshold.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(B){var A={series:{threshold:null}};function C(D){function
E(L,S,M){if(!S.threshold){return }var
F=M.pointsize,I,O,N,G,K,H=B.extend({},S);H.datapoints={points:[],pointsize:F};H.label=null;H.color=S.threshold.color;H.threshold=null;H.originSeries=S;H.data=[];var
P=S.threshold.below,Q=M.points,R=S.lines.show;threspoints=[];newpoints=[];for(I=0;I<Q.length;I+=F){O=Q[I];N=Q[I+1];K=G;if(N<P){G=threspoints}else{G=newpoints}if(R&&K!=G&&O!=null&&I>0&&Q[I-F]!=null){var
J=(O-Q[I-F])/(N-Q[I [...]
diff --git a/server/monitor/src/main/resources/web/flot/jquery.min.js
b/server/monitor/src/main/resources/web/flot/jquery.min.js
deleted file mode 100644
index ac65215..0000000
--- a/server/monitor/src/main/resources/web/flot/jquery.min.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * jQuery JavaScript Library v1.5.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Wed Feb 23 13:55:29 2011 -0500
- */
-(function(aY,H){var al=aY.document;var a=(function(){var
bn=function(bI,bJ){return new
bn.fn.init(bI,bJ,bl)},bD=aY.jQuery,bp=aY.$,bl,bH=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,bv=/\S/,br=/^\s+/,bm=/\s+$/,bq=/\d/,bj=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,bw=/^[\],:{}\s]*$/,bF=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,by=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,bs=/(?:^|:|,)(?:\s*\[)+/g,bh=/(webkit)[
\/]([\w.]+)/,bA=/(opera)(?:.*version)?[ \/]([\w.]+)/,bz=/(msie) ([\w.]+)/,bB
[...]
-/*
- * Sizzle CSS Selector Engine
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){var
bn=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^
>+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,bo=0,br=Object.prototype.toString,bi=false,bh=true,bp=/\\/g,bv=/\W/;[0,0].sort(function(){bh=false;return
0});var bf=function(bA,e,bD,bE){bD=bD||[];e=e||al;var
bG=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!bA||typeof
bA!=="string"){return bD}var
bx,bI,bL,bw,bH,bK,bJ,bC,bz=true,by=bf.isXML(e),bB=[],bF=bA;do{bn.exec("");bx=bn.exec(b
[...]
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].
