Replace jQuery isType functions with _.isType functions

Jack Toole · Jack Toole · commit d0c76c363fca · 2013-10-25T14:20:45.000-07:00
Test Plan: none

Auditors: alex
diff --git a/exercises/conditional_statements_2.html b/exercises/conditional_statements_2.html
@@ -15,7 +15,7 @@
 
         var makeDisplay = function(str) {
             var color = 0;
-            if ($.isArray(str)) {
+            if (_.isArray(str)) {
                 color = str[1];
                 str = str[0];
             }
@@ -39,7 +39,7 @@
         }
 
         var makeStatement = function(str) {
-            if ($.isArray(str)) {
+            if (_.isArray(str)) {
                 var color = str[1];
                 str = str[0];
 
diff --git a/history.js b/history.js
@@ -314,7 +314,7 @@ function renderReadOnlyProblem(event, args) {
                 };
 
                 if (framework === "khan-exercises") {
-                    if (thisSlide.data("guess") !== undefined && $.isFunction(answerData.showCustomGuess)) {
+                    if (thisSlide.data("guess") !== undefined && _.isFunction(answerData.showCustomGuess)) {
                         KhanUtil.currentGraph = $(realWorkArea).find(".graphie").data("graphie");
                         answerData.showCustomGuess(thisSlide.data("guess"));
                         MathJax.Hub.Queue(recordState);
diff --git a/utils/algebra-intuition.js b/utils/algebra-intuition.js
@@ -173,7 +173,7 @@ KhanUtil.scale = {
                     KhanUtil.scale.graphie.scalePoint([0, 0])[1]);
             }
         });
-        if ($.isFunction(this.onChange)) {
+        if (_.isFunction(this.onChange)) {
             this.onChange(this.leftCoef, this.leftConst,
                 this.rightCoef, this.rightConst);
         }
diff --git a/utils/answer-types.js b/utils/answer-types.js
@@ -1072,7 +1072,7 @@ Khan.answerTypes = $.extend(Khan.answerTypes, {
                     // Iterate through each of the answerDatas, and show the
                     // cooresponding custom guess for each if it exists
                     $.each(answerDataArray, function(i, answerData) {
-                        if (!$.isFunction(answerData.showCustomGuess)) {
+                        if (!_.isFunction(answerData.showCustomGuess)) {
                             return;
                         }
                         if (guess !== undefined) {
diff --git a/utils/graphie.js b/utils/graphie.js
@@ -628,7 +628,7 @@
                 var result;
 
                 // The last argument is probably trying to change the style
-                if (typeof last === "object" && !$.isArray(last)) {
+                if (typeof last === "object" && !_.isArray(last)) {
                     currentStyle = $.extend({}, currentStyle, processAttributes(last));
 
                     var rest = [].slice.call(arguments, 0, arguments.length - 1);
@@ -729,7 +729,7 @@
                      range[1][1] + (range[1][1] < 0 ? 1 : 0)]
                 ];
 
-            if (!$.isArray(unityLabels)) {
+            if (!_.isArray(unityLabels)) {
                 unityLabels = [unityLabels, unityLabels];
             }
 
diff --git a/utils/interactive.js b/utils/interactive.js
@@ -912,12 +912,12 @@ $.extend(KhanUtil.Graphie.prototype, {
                             // By returning false from onMove(), the move can be vetoed,
                             // providing custom constraints on where the point can be moved.
                             // By returning array [x, y], the move can be overridden
-                            if ($.isFunction(movablePoint.onMove)) {
+                            if (_.isFunction(movablePoint.onMove)) {
                                 var result = movablePoint.onMove(coordX, coordY);
                                 if (result === false) {
                                     doMove = false;
                                 }
-                                if ($.isArray(result)) {
+                                if (_.isArray(result)) {
                                     coordX = result[0];
                                     coordY = result[1];
                                 }
@@ -942,9 +942,9 @@ $.extend(KhanUtil.Graphie.prototype, {
                             $(document).unbind("vmousemove vmouseup");
                             movablePoint.dragging = false;
                             KhanUtil.dragging = false;
-                            if ($.isFunction(movablePoint.onMoveEnd)) {
+                            if (_.isFunction(movablePoint.onMoveEnd)) {
                                 var result = movablePoint.onMoveEnd(coordX, coordY);
-                                if ($.isArray(result)) {
+                                if (_.isArray(result)) {
                                     coordX = result[0];
                                     coordY = result[1];
                                     mouseX = (coordX - graph.range[0][0]) * graph.scale[0];
@@ -1005,7 +1005,7 @@ $.extend(KhanUtil.Graphie.prototype, {
                 this.mouseTarget.animate(end, time);
             }
             this.coord = [coordX, coordY];
-            if ($.isFunction(this.onMove)) {
+            if (_.isFunction(this.onMove)) {
                 this.onMove(coordX, coordY);
             }
         };
@@ -1200,7 +1200,7 @@ $.extend(KhanUtil.Graphie.prototype, {
             coordY = fn(closestX);
 
             // If the caller wants to be notified when the user points to the function
-            if ($.isFunction(interactiveFn.onMove)) {
+            if (_.isFunction(interactiveFn.onMove)) {
                 interactiveFn.onMove(coordX, coordY);
             }
 
@@ -1212,7 +1212,7 @@ $.extend(KhanUtil.Graphie.prototype, {
                 interactiveFn.highlight = false;
                 interactiveFn.cursorPoint.animate({ opacity: 0.0 }, 50);
                 // If the caller wants to be notified when the user stops pointing to the function
-                if ($.isFunction(interactiveFn.onLeave)) {
+                if (_.isFunction(interactiveFn.onLeave)) {
                     interactiveFn.onLeave(coordX, coordY);
                 }
             }
@@ -1534,7 +1534,7 @@ $.extend(KhanUtil.Graphie.prototype, {
                                 }
                             }
 
-                            if ($.isFunction(lineSegment.onMove)) {
+                            if (_.isFunction(lineSegment.onMove)) {
                                 lineSegment.onMove(dX, dY);
                             }
 
@@ -1545,7 +1545,7 @@ $.extend(KhanUtil.Graphie.prototype, {
                             if (!lineSegment.highlight) {
                                 lineSegment.visibleLine.animate(lineSegment.normalStyle, 50);
                             }
-                            if ($.isFunction(lineSegment.onMoveEnd)) {
+                            if (_.isFunction(lineSegment.onMoveEnd)) {
                                 lineSegment.onMoveEnd();
                             }
 
@@ -1895,11 +1895,11 @@ $.extend(KhanUtil.Graphie.prototype, {
                             // moved. By returning array [dX, dY], the move can
                             // be overridden.
                             var doMove = true;
-                            if ($.isFunction(polygon.onMove)) {
+                            if (_.isFunction(polygon.onMove)) {
                                 var onMoveResult = polygon.onMove(dX, dY);
                                 if (onMoveResult === false) {
                                     doMove = false;
-                                } else if ($.isArray(onMoveResult)) {
+                                } else if (_.isArray(onMoveResult)) {
                                     dX = onMoveResult[0];
                                     dY = onMoveResult[1];
                                 }
@@ -1943,7 +1943,7 @@ $.extend(KhanUtil.Graphie.prototype, {
                                     point.visibleShape.animate(point.normalStyle, 50);
                                 });
                             }
-                            if ($.isFunction(polygon.onMoveEnd)) {
+                            if (_.isFunction(polygon.onMoveEnd)) {
                                 polygon.onMoveEnd();
                             }
                         }
diff --git a/utils/mean-and-median.js b/utils/mean-and-median.js
@@ -129,14 +129,14 @@ $.extend(KhanUtil, {
             $.each(points, function() {
                 if (this !== point) {
                     var pos = Math.round(this.coord[0] * 2) / 2;
-                    if (!$.isArray(positions[pos])) {
+                    if (!_.isArray(positions[pos])) {
                         positions[pos] = [];
                     }
                     positions[pos].push(this);
                 }
             });
 
-            if ($.isFunction(updateFunction)) {
+            if (_.isFunction(updateFunction)) {
                 updateFunction();
             }
 
diff --git a/utils/polynomials.js b/utils/polynomials.js
@@ -24,10 +24,10 @@ $.extend(KhanUtil, {
             if (typeof expr === "number") {
                 coef = expr;
                 degree = 0;
-            } else if ($.isArray(expr) && !$.isArray(expr[2])) {
+            } else if (_.isArray(expr) && !_.isArray(expr[2])) {
                 coef = expr[1];
                 degree = 1;
-            } else if ($.isArray(expr) && $.isArray(expr[2])) {
+            } else if (_.isArray(expr) && _.isArray(expr[2])) {
                 coef = expr[1];
                 degree = expr[2][2];
             }
diff --git a/utils/word-problems.js b/utils/word-problems.js
@@ -32,7 +32,7 @@ $.extend(KhanUtil, {
 
     toSentenceTex: function(array, highlight, highlightClass) {
         var wrapped = $.map(array, function(elem) {
-            if (($.isFunction(highlight) && highlight(elem)) || (highlight !== undefined && elem === highlight)) {
+            if ((_.isFunction(highlight) && highlight(elem)) || (highlight !== undefined && elem === highlight)) {
                 return "<code class='" + highlightClass + "'>" + elem + "</code>";
             }
             return "<code>" + elem + "</code>";

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`var makeDisplay = function(str) {`
`17`	`17`	`var color = 0;`
`18`		`- if ($.isArray(str)) {`
	`18`	`+ if (_.isArray(str)) {`
`19`	`19`	`color = str[1];`
`20`	`20`	`str = str[0];`
`21`	`21`	`}`
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`var makeStatement = function(str) {`
`42`		`- if ($.isArray(str)) {`
	`42`	`+ if (_.isArray(str)) {`
`43`	`43`	`var color = str[1];`
`44`	`44`	`str = str[0];`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ KhanUtil.scale = {`
`173`	`173`	`KhanUtil.scale.graphie.scalePoint([0, 0])[1]);`
`174`	`174`	`}`
`175`	`175`	`});`
`176`		`- if ($.isFunction(this.onChange)) {`
	`176`	`+ if (_.isFunction(this.onChange)) {`
`177`	`177`	`this.onChange(this.leftCoef, this.leftConst,`
`178`	`178`	`this.rightCoef, this.rightConst);`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ Khan.answerTypes = $.extend(Khan.answerTypes, {`
`1072`	`1072`	`// Iterate through each of the answerDatas, and show the`
`1073`	`1073`	`// cooresponding custom guess for each if it exists`
`1074`	`1074`	`$.each(answerDataArray, function(i, answerData) {`
`1075`		`- if (!$.isFunction(answerData.showCustomGuess)) {`
	`1075`	`+ if (!_.isFunction(answerData.showCustomGuess)) {`
`1076`	`1076`	`return;`
`1077`	`1077`	`}`
`1078`	`1078`	`if (guess !== undefined) {`
Original file line number	Diff line number	Diff line change
`@@ -912,12 +912,12 @@ $.extend(KhanUtil.Graphie.prototype, {`
`912`	`912`	`// By returning false from onMove(), the move can be vetoed,`
`913`	`913`	`// providing custom constraints on where the point can be moved.`
`914`	`914`	`// By returning array [x, y], the move can be overridden`
`915`		`- if ($.isFunction(movablePoint.onMove)) {`
	`915`	`+ if (_.isFunction(movablePoint.onMove)) {`
`916`	`916`	`var result = movablePoint.onMove(coordX, coordY);`
`917`	`917`	`if (result === false) {`
`918`	`918`	`doMove = false;`
`919`	`919`	`}`
`920`		`- if ($.isArray(result)) {`
	`920`	`+ if (_.isArray(result)) {`
`921`	`921`	`coordX = result[0];`
`922`	`922`	`coordY = result[1];`
`923`	`923`	`}`
`@@ -942,9 +942,9 @@ $.extend(KhanUtil.Graphie.prototype, {`
`942`	`942`	`$(document).unbind("vmousemove vmouseup");`
`943`	`943`	`movablePoint.dragging = false;`
`944`	`944`	`KhanUtil.dragging = false;`
`945`		`- if ($.isFunction(movablePoint.onMoveEnd)) {`
	`945`	`+ if (_.isFunction(movablePoint.onMoveEnd)) {`
`946`	`946`	`var result = movablePoint.onMoveEnd(coordX, coordY);`
`947`		`- if ($.isArray(result)) {`
	`947`	`+ if (_.isArray(result)) {`
`948`	`948`	`coordX = result[0];`
`949`	`949`	`coordY = result[1];`
`950`	`950`	`mouseX = (coordX - graph.range[0][0]) * graph.scale[0];`
`@@ -1005,7 +1005,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1005`	`1005`	`this.mouseTarget.animate(end, time);`
`1006`	`1006`	`}`
`1007`	`1007`	`this.coord = [coordX, coordY];`
`1008`		`- if ($.isFunction(this.onMove)) {`
	`1008`	`+ if (_.isFunction(this.onMove)) {`
`1009`	`1009`	`this.onMove(coordX, coordY);`
`1010`	`1010`	`}`
`1011`	`1011`	`};`
`@@ -1200,7 +1200,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1200`	`1200`	`coordY = fn(closestX);`
`1201`	`1201`
`1202`	`1202`	`// If the caller wants to be notified when the user points to the function`
`1203`		`- if ($.isFunction(interactiveFn.onMove)) {`
	`1203`	`+ if (_.isFunction(interactiveFn.onMove)) {`
`1204`	`1204`	`interactiveFn.onMove(coordX, coordY);`
`1205`	`1205`	`}`
`1206`	`1206`
`@@ -1212,7 +1212,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1212`	`1212`	`interactiveFn.highlight = false;`
`1213`	`1213`	`interactiveFn.cursorPoint.animate({ opacity: 0.0 }, 50);`
`1214`	`1214`	`// If the caller wants to be notified when the user stops pointing to the function`
`1215`		`- if ($.isFunction(interactiveFn.onLeave)) {`
	`1215`	`+ if (_.isFunction(interactiveFn.onLeave)) {`
`1216`	`1216`	`interactiveFn.onLeave(coordX, coordY);`
`1217`	`1217`	`}`
`1218`	`1218`	`}`
`@@ -1534,7 +1534,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1534`	`1534`	`}`
`1535`	`1535`	`}`
`1536`	`1536`
`1537`		`- if ($.isFunction(lineSegment.onMove)) {`
	`1537`	`+ if (_.isFunction(lineSegment.onMove)) {`
`1538`	`1538`	`lineSegment.onMove(dX, dY);`
`1539`	`1539`	`}`
`1540`	`1540`
`@@ -1545,7 +1545,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1545`	`1545`	`if (!lineSegment.highlight) {`
`1546`	`1546`	`lineSegment.visibleLine.animate(lineSegment.normalStyle, 50);`
`1547`	`1547`	`}`
`1548`		`- if ($.isFunction(lineSegment.onMoveEnd)) {`
	`1548`	`+ if (_.isFunction(lineSegment.onMoveEnd)) {`
`1549`	`1549`	`lineSegment.onMoveEnd();`
`1550`	`1550`	`}`
`1551`	`1551`
`@@ -1895,11 +1895,11 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1895`	`1895`	`// moved. By returning array [dX, dY], the move can`
`1896`	`1896`	`// be overridden.`
`1897`	`1897`	`var doMove = true;`
`1898`		`- if ($.isFunction(polygon.onMove)) {`
	`1898`	`+ if (_.isFunction(polygon.onMove)) {`
`1899`	`1899`	`var onMoveResult = polygon.onMove(dX, dY);`
`1900`	`1900`	`if (onMoveResult === false) {`
`1901`	`1901`	`doMove = false;`
`1902`		`- } else if ($.isArray(onMoveResult)) {`
	`1902`	`+ } else if (_.isArray(onMoveResult)) {`
`1903`	`1903`	`dX = onMoveResult[0];`
`1904`	`1904`	`dY = onMoveResult[1];`
`1905`	`1905`	`}`
`@@ -1943,7 +1943,7 @@ $.extend(KhanUtil.Graphie.prototype, {`
`1943`	`1943`	`point.visibleShape.animate(point.normalStyle, 50);`
`1944`	`1944`	`});`
`1945`	`1945`	`}`
`1946`		`- if ($.isFunction(polygon.onMoveEnd)) {`
	`1946`	`+ if (_.isFunction(polygon.onMoveEnd)) {`
`1947`	`1947`	`polygon.onMoveEnd();`
`1948`	`1948`	`}`
`1949`	`1949`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,14 +129,14 @@ $.extend(KhanUtil, {`
`129`	`129`	`$.each(points, function() {`
`130`	`130`	`if (this !== point) {`
`131`	`131`	`var pos = Math.round(this.coord[0] * 2) / 2;`
`132`		`- if (!$.isArray(positions[pos])) {`
	`132`	`+ if (!_.isArray(positions[pos])) {`
`133`	`133`	`positions[pos] = [];`
`134`	`134`	`}`
`135`	`135`	`positions[pos].push(this);`
`136`	`136`	`}`
`137`	`137`	`});`
`138`	`138`
`139`		`- if ($.isFunction(updateFunction)) {`
	`139`	`+ if (_.isFunction(updateFunction)) {`
`140`	`140`	`updateFunction();`
`141`	`141`	`}`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ $.extend(KhanUtil, {`
`32`	`32`
`33`	`33`	`toSentenceTex: function(array, highlight, highlightClass) {`
`34`	`34`	`var wrapped = $.map(array, function(elem) {`
`35`		`- if (($.isFunction(highlight) && highlight(elem)) \|\| (highlight !== undefined && elem === highlight)) {`
	`35`	`+ if ((_.isFunction(highlight) && highlight(elem)) \|\| (highlight !== undefined && elem === highlight)) {`
`36`	`36`	`return "<code class='" + highlightClass + "'>" + elem + "</code>";`
`37`	`37`	`}`
`38`	`38`	`return "<code>" + elem + "</code>";`