Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Commit

Permalink
finish amd for utils/*
Browse files Browse the repository at this point in the history
  • Loading branch information
@migerh
migerh committed Feb 18, 2013
1 parent fa11459 commit 0aea31e
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 88 deletions.
7 changes: 1 addition & 6 deletions src/loadjsxgraph.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ var JXG = {},
document.write('<script type="text/javascript" src="' + libraryName + '"><\/script>');
};

JXG.baseFiles = 'jxg,base/constants,utils/object,utils/string,utils/number,utils/type,utils/xml,utils/env,utils/browser,utils/array,utils/event,math/math,math/numerics,math/statistics,math/symbolic,math/geometry,math/poly,math/complex,renderer/abstract,renderer/no,reader/file,parser/geonext,base/board,options,jsxgraph,base/element,base/coords,base/point,base/line,base/group,base/circle,element/conic,base/polygon,base/curve,element/arc,element/sector,base/composition,element/composition,base/text,base/image,element/slider,element/measure,base/chart,base/transformation,base/turtle,utils/color,base/ticks,utils/zip,utils/base64,utils/uuid,utils/encoding,server/server,parser/datasource,parser/jessiecode,utils/dump,renderer/svg,renderer/vml,renderer/canvas,renderer/no';
JXG.baseFiles = 'jxg,base/constants,utils/type,utils/xml,utils/env,utils/event,math/math,math/numerics,math/statistics,math/symbolic,math/geometry,math/poly,math/complex,renderer/abstract,renderer/no,reader/file,parser/geonext,base/board,options,jsxgraph,base/element,base/coords,base/point,base/line,base/group,base/circle,element/conic,base/polygon,base/curve,element/arc,element/sector,base/composition,element/composition,base/text,base/image,element/slider,element/measure,base/chart,base/transformation,base/turtle,utils/color,base/ticks,utils/zip,utils/base64,utils/uuid,utils/encoding,server/server,parser/datasource,parser/jessiecode,utils/dump,renderer/svg,renderer/vml,renderer/canvas,renderer/no';
JXG.requirePath = '';

for (i = 0; i < document.getElementsByTagName("script").length; i++) {
Expand Down Expand Up @@ -214,17 +214,12 @@ var JXG = {},

'server/server': makeCheck('Server'),

'utils/array': checkJXG,
'utils/base64': makeCheck('Util.Base64'),
'utils/browser': checkJXG,
'utils/color': checkJXG,
'utils/dump': makeCheck('Dump'),
'utils/encoding': makeCheck('Util.UTF8'),
'utils/env': checkJXG,
'utils/event': makeCheck('EventEmitter'),
'utils/number': checkJXG,
'utils/object': checkJXG,
'utils/string': checkJXG,
'utils/type': checkJXG,
'utils/uuid': makeCheck('Util.genUUID'),
'utils/xml': makeCheck('XML'),
Expand Down
106 changes: 54 additions & 52 deletions src/options.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
utils/type
*/

define([], function () {
define([
'jxg', 'base/constants', 'math/math', 'utils/color', 'utils/type'
], function (JXG, Const, Mat, Color, Type) {

"use strict";

Expand Down Expand Up @@ -1641,13 +1643,13 @@ define([], function () {
},
validateColor = function (v) {
// for now this should do it...
return JXG.isString(v);
return Type.isString(v);
},
validatePointFace = function (v) {
return JXG.exists(JXG.normalizePointFace(v));
return Type.exists(JXG.normalizePointFace(v));
},
validateInteger = function (v) {
return (Math.abs(v - Math.round(v)) < JXG.Math.eps);
return (Math.abs(v - Math.round(v)) < Mat.eps);
},
validatePositiveInteger = function (v) {
return validateInteger(v) && v > 0;
Expand All @@ -1668,26 +1670,26 @@ define([], function () {
validators = {
attractorDistance: validateNotNegative,
color: validateColor,
defaultDistance: JXG.isNumber,
defaultDistance: Type.isNumber,
display: validateDisplay,
doAdvancedPlot: false,
draft: false,
drawLabels: false,
drawZero: false,
face: validatePointFace,
factor: JXG.isNumber,
factor: Type.isNumber,
fillColor: validateColor,
fillOpacity: JXG.isNumber,
fillOpacity: Type.isNumber,
firstArrow: false,
fontSize: validateInteger,
dash: validateInteger,
gridX: JXG.isNumber,
gridY: JXG.isNumber,
gridX: Type.isNumber,
gridY: Type.isNumber,
hasGrid: false,
highlightFillColor: validateColor,
highlightFillOpacity: JXG.isNumber,
highlightFillOpacity: Type.isNumber,
highlightStrokeColor: validateColor,
highlightStrokeOpacity: JXG.isNumber,
highlightStrokeOpacity: Type.isNumber,
insertTicks: false,
//: validateScreenCoords,
lastArrow: false,
Expand All @@ -1698,8 +1700,8 @@ define([], function () {
minTicksDistance: validatePositiveInteger,
numberPointsHigh: validatePositiveInteger,
numberPointsLow: validatePositiveInteger,
opacity: JXG.isNumber,
radius: JXG.isNumber,
opacity: Type.isNumber,
radius: Type.isNumber,
RDPsmoothing: false,
renderer: validateRenderer,
right: validatePixel,
Expand All @@ -1709,14 +1711,14 @@ define([], function () {
size: validateInteger,
snapSizeX: validatePositive,
snapSizeY: validatePositive,
snapWidth: JXG.isNumber,
snapWidth: Type.isNumber,
snapToGrid: false,
snatchDistance: validateNotNegative,
straightFirst: false,
straightLast: false,
stretch: false,
strokeColor: validateColor,
strokeOpacity: JXG.isNumber,
strokeOpacity: Type.isNumber,
strokeWidth: validateInteger,
takeFirst: false,
takeSizeFromFile: false,
Expand Down Expand Up @@ -1821,9 +1823,9 @@ define([], function () {
for (el in board.objects) {
if (board.objects.hasOwnProperty(el)) {
p = board.objects[el];
if (p.elementClass === JXG.OBJECT_CLASS_POINT) {
if (p.elementClass === Const.OBJECT_CLASS_POINT) {
copyProps(p, o.point);
} else if (p.elementClass === JXG.OBJECT_CLASS_LINE) {
} else if (p.elementClass === Const.OBJECT_CLASS_LINE) {
copyProps(p, o.line);

for (t = 0; t < p.ticks.length; t++) {
Expand All @@ -1832,19 +1834,19 @@ define([], function () {
p.ticks[t].visProp.minorheight = o.line.ticks.minorHeight;
p.ticks[t].visProp.majorheight = o.line.ticks.majorHeight;
}
} else if (p.elementClass === JXG.OBJECT_CLASS_CIRCLE) {
} else if (p.elementClass === Const.OBJECT_CLASS_CIRCLE) {
copyProps(p, o.circle);
} else if (p.type === JXG.OBJECT_TYPE_ANGLE) {
} else if (p.type === Const.OBJECT_TYPE_ANGLE) {
copyProps(p, o.angle);
} else if (p.type === JXG.OBJECT_TYPE_ARC) {
} else if (p.type === Const.OBJECT_TYPE_ARC) {
copyProps(p, o.arc);
} else if (p.type === JXG.OBJECT_TYPE_POLYGON) {
} else if (p.type === Const.OBJECT_TYPE_POLYGON) {
copyProps(p, o.polygon);
} else if (p.type === JXG.OBJECT_TYPE_CONIC) {
} else if (p.type === Const.OBJECT_TYPE_CONIC) {
copyProps(p, o.conic);
} else if (p.type === JXG.OBJECT_TYPE_CURVE) {
} else if (p.type === Const.OBJECT_TYPE_CURVE) {
copyProps(p, o.curve);
} else if (p.type === JXG.OBJECT_TYPE_SECTOR) {
} else if (p.type === Const.OBJECT_TYPE_SECTOR) {
p.arc.visProp.fillcolor = o.sector.fillColor;
p.arc.visProp.highlightfillcolor = o.sector.highlightFillColor;
p.arc.visProp.fillopacity = o.sector.fillOpacity;
Expand All @@ -1868,34 +1870,34 @@ define([], function () {
*/
JXG.useBlackWhiteOptions = function (board) {
var o = JXG.Options;
o.point.fillColor = JXG.rgb2bw(o.point.fillColor);
o.point.highlightFillColor = JXG.rgb2bw(o.point.highlightFillColor);
o.point.strokeColor = JXG.rgb2bw(o.point.strokeColor);
o.point.highlightStrokeColor = JXG.rgb2bw(o.point.highlightStrokeColor);

o.line.fillColor = JXG.rgb2bw(o.line.fillColor);
o.line.highlightFillColor = JXG.rgb2bw(o.line.highlightFillColor);
o.line.strokeColor = JXG.rgb2bw(o.line.strokeColor);
o.line.highlightStrokeColor = JXG.rgb2bw(o.line.highlightStrokeColor);

o.circle.fillColor = JXG.rgb2bw(o.circle.fillColor);
o.circle.highlightFillColor = JXG.rgb2bw(o.circle.highlightFillColor);
o.circle.strokeColor = JXG.rgb2bw(o.circle.strokeColor);
o.circle.highlightStrokeColor = JXG.rgb2bw(o.circle.highlightStrokeColor);

o.arc.fillColor = JXG.rgb2bw(o.arc.fillColor);
o.arc.highlightFillColor = JXG.rgb2bw(o.arc.highlightFillColor);
o.arc.strokeColor = JXG.rgb2bw(o.arc.strokeColor);
o.arc.highlightStrokeColor = JXG.rgb2bw(o.arc.highlightStrokeColor);

o.polygon.fillColor = JXG.rgb2bw(o.polygon.fillColor);
o.polygon.highlightFillColor = JXG.rgb2bw(o.polygon.highlightFillColor);

o.sector.fillColor = JXG.rgb2bw(o.sector.fillColor);
o.sector.highlightFillColor = JXG.rgb2bw(o.sector.highlightFillColor);

o.curve.strokeColor = JXG.rgb2bw(o.curve.strokeColor);
o.grid.gridColor = JXG.rgb2bw(o.grid.gridColor);
o.point.fillColor = Color.rgb2bw(o.point.fillColor);
o.point.highlightFillColor = Color.rgb2bw(o.point.highlightFillColor);
o.point.strokeColor = Color.rgb2bw(o.point.strokeColor);
o.point.highlightStrokeColor = Color.rgb2bw(o.point.highlightStrokeColor);

o.line.fillColor = Color.rgb2bw(o.line.fillColor);
o.line.highlightFillColor = Color.rgb2bw(o.line.highlightFillColor);
o.line.strokeColor = Color.rgb2bw(o.line.strokeColor);
o.line.highlightStrokeColor = Color.rgb2bw(o.line.highlightStrokeColor);

o.circle.fillColor = Color.rgb2bw(o.circle.fillColor);
o.circle.highlightFillColor = Color.rgb2bw(o.circle.highlightFillColor);
o.circle.strokeColor = Color.rgb2bw(o.circle.strokeColor);
o.circle.highlightStrokeColor = Color.rgb2bw(o.circle.highlightStrokeColor);

o.arc.fillColor = Color.rgb2bw(o.arc.fillColor);
o.arc.highlightFillColor = Color.rgb2bw(o.arc.highlightFillColor);
o.arc.strokeColor = Color.rgb2bw(o.arc.strokeColor);
o.arc.highlightStrokeColor = Color.rgb2bw(o.arc.highlightStrokeColor);

o.polygon.fillColor = Color.rgb2bw(o.polygon.fillColor);
o.polygon.highlightFillColor = Color.rgb2bw(o.polygon.highlightFillColor);

o.sector.fillColor = Color.rgb2bw(o.sector.fillColor);
o.sector.highlightFillColor = Color.rgb2bw(o.sector.highlightFillColor);

o.curve.strokeColor = Color.rgb2bw(o.curve.strokeColor);
o.grid.gridColor = Color.rgb2bw(o.grid.gridColor);

JXG.useStandardOptions(board);
};
Expand Down
6 changes: 3 additions & 3 deletions src/utils/base64.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
utils/encoding
*/

define([], function () {
define(['jxg', 'utils/encoding'], function (JXG, Encoding) {

"use strict";

Expand All @@ -27,7 +27,7 @@ define([], function () {
output = [],
i = 0;

input = JXG.Util.UTF8.encode(input);
input = Encoding.encode(input);

while (i < input.length) {
chr1 = input.charCodeAt(i++);
Expand Down Expand Up @@ -91,7 +91,7 @@ define([], function () {
output = output.join('');

if (utf8) {
output = JXG.Util.UTF8.decode(output);
output = Encoding.decode(output);
}

return output;
Expand Down
11 changes: 6 additions & 5 deletions src/utils/color.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

/* depends:
jxg
utils/type
math/math
*/

Expand All @@ -44,7 +45,7 @@
* Stoyan Stefanov <[email protected]> (see http://www.phpied.com/rgb-color-parser-in-javascript/)
*/

define([], function () {
define(['jxg', 'utils/type', 'math/math'], function (JXG, Type, Mat) {

"use strict";

Expand Down Expand Up @@ -258,17 +259,17 @@ define([], function () {
values = color,
testFloat = false;

if (!JXG.exists(color)) {
if (!Type.exists(color)) {
return [];
}

if (JXG.exists(ag) && JXG.exists(ab)) {
if (Type.exists(ag) && Type.exists(ab)) {
values = [color, ag, ab];
}

color_string = values;

if (JXG.isArray(color_string)) {
if (Type.isArray(color_string)) {
for (i = 0; i < 3; i++) {
testFloat = testFloat || /\./.test(values[i].toString());
}
Expand Down Expand Up @@ -409,7 +410,7 @@ define([], function () {
H = ((H % 360.0) + 360.0) % 360;

if (S === 0) {
if (isNaN(H) || H < JXG.Math.eps) {
if (isNaN(H) || H < Mat.eps) {
R = V;
G = V;
B = V;
Expand Down
21 changes: 10 additions & 11 deletions src/utils/dump.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@
/* depends:
jxg
utils/type
utils/object
*/

/**
* @fileoverview The JXG.Dump namespace provides methods to save a board to javascript.
*/

define([], function () {
define(['jxg', 'utils/type'], function (JXG, Type) {

"use strict";

Expand All @@ -57,16 +56,16 @@ define([], function () {
* Adds markers to every element of the board
* @param {JXG.Board} board
* @param {Array|String} markers
* @param {Array|%} values
* @param {Array} values
*/
addMarkers: function (board, markers, values) {
var e, l, i;

if (!JXG.isArray(markers)) {
if (!Type.isArray(markers)) {
markers = [markers];
}

if (!JXG.isArray(values)) {
if (!Type.isArray(values)) {
values = [values];
}

Expand All @@ -92,7 +91,7 @@ define([], function () {
deleteMarkers: function (board, markers) {
var e, l, i;

if (!JXG.isArray(markers)) {
if (!Type.isArray(markers)) {
markers = [markers];
}

Expand Down Expand Up @@ -130,7 +129,7 @@ define([], function () {
* @returns {Object} Minimal attributes object
*/
minimizeObject: function (instance, s) {
var p, pl, copy = JXG.deepCopy(instance),
var p, pl, copy = Type.deepCopy(instance),
defaults = [], i;

for (i = 1; i < arguments.length; i++) {
Expand Down Expand Up @@ -231,7 +230,7 @@ define([], function () {
if (obj) {
list = [];

if (JXG.isArray(obj)) {
if (Type.isArray(obj)) {
for (i = 0; i < obj.length; i++) {
list.push(this.toJSAN(obj[i]));
}
Expand Down Expand Up @@ -268,7 +267,7 @@ define([], function () {
elements = this.dump(board),
script = [];

script.push('$board.setView(' + JXG.toJSON(board.getBoundingBox()) + ');');
script.push('$board.setView(' + Type.toJSON(board.getBoundingBox()) + ');');

for (i = 0; i < elements.length; i++) {
if (elements[i].attributes.name.length > 0) {
Expand All @@ -292,10 +291,10 @@ define([], function () {
elements = this.dump(board),
script = [];

script.push('board.setBoundingBox(' + JXG.toJSON(board.getBoundingBox()) + ');');
script.push('board.setBoundingBox(' + Type.toJSON(board.getBoundingBox()) + ');');

for (i = 0; i < elements.length; i++) {
script.push('board.create("' + elements[i].type + '", [' + elements[i].parents.join(', ') + '], ' + JXG.toJSON(elements[i].attributes) + ');');
script.push('board.create("' + elements[i].type + '", [' + elements[i].parents.join(', ') + '], ' + Type.toJSON(elements[i].attributes) + ');');
}

return script.join('\n');
Expand Down
2 changes: 1 addition & 1 deletion src/utils/encoding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
jxg
*/

define([], function () {
define(['jxg'], function (JXG) {

"use strict";

Expand Down
Loading

0 comments on commit 0aea31e

Please sign in to comment.