Skip to content

Allowing passing a string to get ObjectID parsed. #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allowing passing a string to get ObjectID parsed. #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6613a99
Allowing passing a string to get ObjectID parsed.
LiamKarlMitchell Aug 8, 2015
acf03ff
Removed debugger statement
LiamKarlMitchell Aug 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/main/javascript/Objectid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* and GPL (http://www.opensource.org/licenses/gpl-license.php) version 2 licenses.
* This software is not distributed under version 3 or later of the GPL.
*
* Version 1.0.2
*
* Version 1.0.2 (Liams Modifications)
* Source: https://github.com/justaprogrammer/ObjectId.js
*/

if (!document) var document = { cookie: '' }; // fix crashes on node
Expand All @@ -25,14 +25,14 @@ var ObjectId = (function () {
for (var i in cookieList) {
var cookie = cookieList[i].split('=');
var cookieMachineId = parseInt(cookie[1], 10);
if (cookie[0] == 'mongoMachineId' && cookieMachineId && cookieMachineId >= 0 && cookieMachineId <= 16777215) {
if (cookie[0] === 'mongoMachineId' && cookieMachineId && cookieMachineId >= 0 && cookieMachineId <= 16777215) {
machine = cookieMachineId;
break;
}
}
document.cookie = 'mongoMachineId=' + machine + ';expires=Tue, 19 Jan 2038 05:00:00 GMT;path=/';
};
if (typeof (localStorage) != 'undefined') {
if (typeof (localStorage) !== 'undefined') {
try {
var mongoMachineId = parseInt(localStorage['mongoMachineId']);
if (mongoMachineId >= 0 && mongoMachineId <= 16777215) {
Expand All @@ -50,22 +50,22 @@ var ObjectId = (function () {

function ObjId() {
if (!(this instanceof ObjectId)) {
return new ObjectId(arguments[0], arguments[1], arguments[2], arguments[3]).toString();
return new ObjectId(arguments[0], arguments[1], arguments[2], arguments[3]);
}

if (typeof (arguments[0]) == 'object') {
if (typeof (arguments[0]) === 'object') {
this.timestamp = arguments[0].timestamp;
this.machine = arguments[0].machine;
this.pid = arguments[0].pid;
this.increment = arguments[0].increment;
}
else if (typeof (arguments[0]) == 'string' && arguments[0].length == 24) {
this.timestamp = Number('0x' + arguments[0].substr(0, 8)),
this.machine = Number('0x' + arguments[0].substr(8, 6)),
this.pid = Number('0x' + arguments[0].substr(14, 4)),
this.increment = Number('0x' + arguments[0].substr(18, 6))
else if (typeof (arguments[0]) === 'string' && arguments[0].length === 24) {
this.timestamp = Number('0x' + arguments[0].substr(0, 8));
this.machine = Number('0x' + arguments[0].substr(8, 6));
this.pid = Number('0x' + arguments[0].substr(14, 4));
this.increment = Number('0x' + arguments[0].substr(18, 6));
}
else if (arguments.length == 4 && arguments[0] != null) {
else if (arguments.length === 4 && arguments[0] !== null) {
this.timestamp = arguments[0];
this.machine = arguments[1];
this.pid = arguments[2];
Expand Down Expand Up @@ -117,4 +117,4 @@ ObjectId.prototype.toString = function () {
'000000'.substr(0, 6 - machine.length) + machine +
'0000'.substr(0, 4 - pid.length) + pid +
'000000'.substr(0, 6 - increment.length) + increment;
};
};