Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update TaffyDB to 2.7 with a large number of changes

  • Loading branch information...
commit 8c3e735c968c5dade4ac1bd8400e7248190ecc27 1 parent 968b5cf
@typicaljoe authored
Showing with 1 addition and 42 deletions.
  1. +1 −42 taffy.js
View
43 taffy.js
@@ -34,11 +34,7 @@ var TAFFY, exports, T;
API, protectJSON, each, eachin,
isIndexable, returnFilter, runFilters,
numcharsplit, orderByCol, run, intersection,
-<<<<<<< HEAD
- filter, makeCid, safeForJson,
-=======
filter, makeCid, safeForJson,
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
isRegexp
;
@@ -47,11 +43,7 @@ var TAFFY, exports, T;
// TC = Counter for Taffy DBs on page, used for unique IDs
// cmax = size of charnumarray conversion cache
// idpad = zeros to pad record IDs with
-<<<<<<< HEAD
- version = '2.6.2'; // proposed mmikowski 2012-08-06
-=======
- version = '2.7';
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
+ version = '2.7';
TC = 1;
idpad = '000000';
cmax = 1000;
@@ -80,16 +72,6 @@ var TAFFY, exports, T;
};
// gracefully stolen from underscore.js
-<<<<<<< HEAD
- intersection = function(array1, array2) {
- return filter(array1, function(item) {
- return array2.indexOf(item) >= 0;
- });
- };
-
- // gracefully stolen from underscore.js
-=======
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
filter = function(obj, iterator, context) {
var results = [];
if (obj == null) return results;
@@ -376,11 +358,7 @@ var TAFFY, exports, T;
? mvalue.toLowerCase() === mtest.toLowerCase()
: mvalue === mtest) : (s === 'has')
? (T.has( mvalue, mtest )) : (s === 'hasall')
-<<<<<<< HEAD
- ? (T.hasAll( mvalue, mtest )) : (s === 'contains')
-=======
? (T.hasAll( mvalue, mtest )) : (s === 'contains')
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
? (TAFFY.isArray(mvalue) && mvalue.indexOf(mtest) > -1) : (
s.indexOf( 'is' ) === -1
&& !TAFFY.isNull( mvalue )
@@ -1036,20 +1014,6 @@ var TAFFY, exports, T;
if ( !is_ok ){ break CONDITION; } // short circuit
}
-<<<<<<< HEAD
-
- if ( is_ok ){
- result_list.push( fnCombineRow( left_row, right_row ) );
- }
- } );
- } );
- return TAFFY( result_list )();
- };
-
- return fnMain;
- }());
-
-=======
if ( is_ok ){
result_list.push( fnCombineRow( left_row, right_row ) );
@@ -1062,7 +1026,6 @@ var TAFFY, exports, T;
return fnMain;
}());
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
API.extend( 'join', innerJoinFunction );
}());
@@ -1880,11 +1843,7 @@ var TAFFY, exports, T;
});
}
else if ( T.isString( var2 ) || T.isNumber( var2 ) ){
-<<<<<<< HEAD
- re = false;
-=======
re = false;
->>>>>>> 2.7 commit. Massive list of bug fixes on updated provided by DanielRuf, mmikowski, japettyjohn, tomgutz, and lea-anthony
for ( n = 0; n < var1.length; n++ ){
re = T.has( var1[n], var2 );
if ( re ){
Please sign in to comment.
Something went wrong with that request. Please try again.