Skip to content

Commit 47d632a

Browse files
committed
change flot namespace
1 parent 18a7656 commit 47d632a

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
1010

1111
BASE_FILES = ${SRC_DIR}/core.js\
1212
${SRC_DIR}/distribution.js\
13-
${SRC_DIR}/special.js
13+
${SRC_DIR}/special.js\
14+
${SRC_DIR}/plugin/flot.jstat.js
1415

1516
JS = ${DIST_DIR}/jstat.js
1617
JS_MIN = ${DIST_DIR}/jstat.min.js

src/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jStat.fn = jStat.prototype = {
9090
},
9191

9292
// only to be used internally
93-
push : Array.prototype.push,
93+
push : [].push,
9494
sort : [].sort,
9595
splice : [].splice
9696
};

src/plugin/flot.jstat.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var defaults = {
1212
flotopts : {}
1313
};
1414

15-
jStat.plot = function( selector, funcs, opts ) {
15+
jStat.flot = function( selector, funcs, opts ) {
1616
opts = jQuery.extend( true, {}, defaults, opts );
1717

1818
var data = [],

test/js/tests/flot-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$(function() {
22
var betaInst = jStat.beta( 3, 4 );
3-
j$.plot( '#betadiv', [{
3+
j$.flot( '#betadiv', [{
44
data : betaInst.pdf,
55
label : 'PDF'
66
},{
@@ -14,7 +14,7 @@ $(function() {
1414
});
1515

1616
var cauchyInst = jStat.cauchy( 3, 4 );
17-
j$.plot( '#cauchydiv', [{
17+
j$.flot( '#cauchydiv', [{
1818
data : cauchyInst.pdf,
1919
label : 'PDF'
2020
},{
@@ -30,7 +30,7 @@ $(function() {
3030
});
3131

3232
var stInst = jStat.studentt( 4 );
33-
j$.plot( '#studenttdiv', [{
33+
j$.flot( '#studenttdiv', [{
3434
data : stInst.pdf,
3535
label : 'PDF'
3636
},{

0 commit comments

Comments
 (0)