Граф коммитов

284 Коммитов

Автор SHA1 Сообщение Дата
Andrea Marchesini 7a681dccf6 Bug 1358111 - Use IPCBlob in Entries API - part 2 - Entries API, r=smaug 2017-04-24 12:16:49 +02:00
Andrea Marchesini 44a1314868 Bug 1358111 - Use IPCBlob in Entries API - part 1 - GetFilesHelper, r=smaug 2017-04-24 12:16:49 +02:00
Andrea Marchesini 7b2382f375 Bug 1350933 - Labeling dom/filesystem - part 3 - IPC actors, r=billm 2017-04-05 09:47:56 +02:00
Andrea Marchesini 59743dbfbf Bug 1350933 - Labeling dom/filesystem - part 2 - DispatchTo{Current,Main}Thread, r=billm 2017-04-05 09:47:34 +02:00
Andrea Marchesini cbea30a731 Bug 1350933 - Labeling dom/filesystem - part 1 - Runnable, r=billm 2017-04-05 09:47:09 +02:00
Andrea Marchesini 97fbc18cea Bug 1349276 - Paths received by FileSystemRequestParent need to be sanitized before passed to IsDescendantPath, r=haik 2017-03-27 09:48:41 +02:00
Carsten "Tomcat" Book df98772632 Backed out changeset 11c73e8f71bb (bug 1349276) for bustage 2017-03-27 09:02:43 +02:00
Andrea Marchesini dc173b26b1 Bug 1349276 - Paths received by FileSystemRequestParent need to be sanitized before passed to IsDescendantPath, r=haik 2017-03-27 08:18:43 +02:00
Andrea Marchesini a628be7b36 Bug 1344415 - Introduce a security check about which files can be opened by a content process, r=ehsan
Entries API gives access to the filesystem. With this patch we allow that only
to patches, previously shared by a FilePicker or a DataTransfer event.
2017-03-16 08:53:49 +01:00
Andrea Marchesini b400713a16 Bug 1346801 - Make Directory object always cloneable, r=qdot 2017-03-14 11:38:31 +01:00
Andrea Marchesini e4d85e8db3 Bug 1346801 - No need to dispatch runnables to the main-thread for Entries API, r=qdot 2017-03-14 11:38:06 +01:00
Andrea Marchesini 9fa58ed270 Bug 1299500 - Get rid of DeviceStorage API - part 11 - FileSystem, r=ehsan 2017-03-08 20:15:45 +01:00
Andrea Marchesini 12b54aa0f5 Bug 1299500 - Get rid of DeviceStorage API - part 10 - DeviceStorage, r=ehsan, r=billm 2017-03-08 20:15:45 +01:00
Andrea Marchesini fb4c8780f3 Bug 1299500 - Get rid of DeviceStorage API - part 9 - Directory::GetRoot, r=ehsan 2017-03-08 20:15:45 +01:00
Andrea Marchesini 30ecbb1c86 Bug 1299500 - Get rid of DeviceStorage API - part 8 - Directory::Get, r=ehsan 2017-03-08 20:15:45 +01:00
Andrea Marchesini d4bba716a6 Bug 1299500 - Get rid of DeviceStorage API - part 7 - Directory::Remove, r=ehsan 2017-03-08 20:15:45 +01:00
Andrea Marchesini 6c1325bca7 Bug 1299500 - Get rid of DeviceStorage API - part 6 - Directory::CreateDirectory, r=ehsan 2017-03-08 20:15:45 +01:00
Andrea Marchesini 9d5265246b Bug 1299500 - Get rid of DeviceStorage API - part 5 - Directory::CreateFile, r=ehsan 2017-03-08 20:15:44 +01:00
Michael Layzell befc7b0924 Bug 1331434 - Part 9: Return after ErrorResult::Throw in /dom, r=ehsan
MozReview-Commit-ID: CWjx4L8LTr9
2017-03-07 19:06:48 -05:00
Joel Maher f297f17181 Bug 1339232 - annotate more dom/* moz.build files with BUG_COMPONENT. r=overholt
MozReview-Commit-ID: 2HbPxGkrVfv
2017-03-01 08:20:25 -05:00
Masatoshi Kimura 7be7b11a1c Bug 1342144 - Remove version parameter from the type attribute of script elements. r=jmaher
This patch is generated by the following sed script:
find . ! -wholename '*/.hg*' -type f \( -iname '*.html' -o -iname '*.xhtml' -o -iname '*.xul' -o -iname '*.js' \) -exec sed -i -e 's/\(\(text\|application\)\/javascript\);version=1.[0-9]/\1/g' {} \;

MozReview-Commit-ID: AzhtdwJwVNg

--HG--
extra : rebase_source : e8f90249454c0779d926f87777f457352961748d
2017-02-23 06:10:07 +09:00
Andrea Marchesini 3043646e52 Bug 1339871 - Splitting dom/file/File.{h,cpp}, r=smaug
--HG--
rename : dom/file/File.cpp => dom/file/BaseBlobImpl.cpp
rename : dom/file/File.h => dom/file/BaseBlobImpl.h
rename : dom/file/File.cpp => dom/file/Blob.cpp
rename : dom/file/File.h => dom/file/Blob.h
rename : dom/file/File.cpp => dom/file/BlobImpl.cpp
rename : dom/file/File.h => dom/file/BlobImpl.h
rename : dom/file/File.cpp => dom/file/EmptyBlobImpl.cpp
rename : dom/file/File.h => dom/file/EmptyBlobImpl.h
rename : dom/file/File.cpp => dom/file/FileBlobImpl.cpp
rename : dom/file/File.h => dom/file/FileBlobImpl.h
rename : dom/file/File.cpp => dom/file/MemoryBlobImpl.cpp
rename : dom/file/File.h => dom/file/MemoryBlobImpl.h
rename : dom/file/File.cpp => dom/file/StreamBlobImpl.cpp
rename : dom/file/File.h => dom/file/StreamBlobImpl.h
rename : dom/file/File.h => dom/file/StringBlobImpl.h
rename : dom/file/File.h => dom/file/TemporaryBlobImpl.h
2017-02-16 18:26:38 +01:00
Andrea Marchesini 8cf1cb8c2f Bug 1335536 - File.createFromNsIFile and File.createFromFileName should be async - part 1 - tests, r=smaug 2017-02-08 10:18:32 +01:00
Andrea Marchesini fc26940d57 Bug 1336091 - File.relativeWebkitPath should not start with '/', r=smaug 2017-02-06 11:07:54 +01:00
Andrea Marchesini f7dc102b1b Bug 1336481 - Window is not used in the ErrorCallback runnable in the Entries API, r=qdot 2017-02-03 19:51:24 +01:00
Masatoshi Kimura 96feb72589 Bug 1333631 - Fix misuse of nsIFile::GetNativeTarget in dom/filesystem. r=baku
MozReview-Commit-ID: 9VpLg1iNFxs

--HG--
extra : rebase_source : b0c0bc340d206ce967098082e2a341bd2a475b39
2017-01-27 00:48:52 +09:00
Sebastian Hengst ccd3fc9950 Backed out changeset 99587cc6ef23 (bug 1335536) for failing robocop testFilePicker on Android. r=backout 2017-02-01 19:08:22 +01:00
Andrea Marchesini 3b9eaa7785 Bug 1335536 - File.createFromNsIFile and File.createFromFileName should be async - part 1 - tests, r=smaug 2017-02-01 17:13:08 +01:00
Andrea Marchesini acb69b3cbc Bug 1332003 - Entries API must create BlobImpl in the parent process, r=smaug 2017-02-01 07:33:18 +01:00
Nathan Froyd d5472817de Bug 1335460 - release globals properly when GetFilesHelper is destroyed on the main thread; r=smaug 2017-01-31 13:08:28 -05:00
Florian Quèze 0e0865f4fc Bug 1331599 - script-generated patch to replace removeEventListener calls with the once option when possible, r=jaws. 2017-01-25 07:01:52 +01:00
Andrea Marchesini c980b8d524 Bug 1323935 - Entries API must use NS_NewLocalFile instead of NS_NewNativeLocalFile, r=smaug 2017-01-18 04:48:29 +01:00
Olli Pettay 0364dbc792 Bug 1326507, remove NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS, r=mccr8
--HG--
extra : rebase_source : 3ae1207308de120b7299b13ecaa95dd1612b3459
2017-01-03 21:47:55 +02:00
Tomislav Jurin 348bfffc19 Bug 1296189 - Replace NS_RUNTIMEABORT("some string literal message") with MOZ_CRASH(). r=froydnj 2016-12-02 13:46:53 -08:00
Andrea Marchesini 6896d43695 Bug 1319088 - FormData should not add extra '/' in the Blob path, r=smaug 2016-12-01 08:59:36 +01:00
Andrea Marchesini 5586ec8d26 Bug 1319370 - HTMLInputElement should select the directory for the FilePicker using the input type (file or directory), r=jwatt 2016-11-23 13:02:10 +01:00
Ehsan Akhgari dc33b55d94 Bug 1312101 - Part 2: Remove AppProcessChecker and code that depends on it; r=baku 2016-11-16 14:51:08 -05:00
Kan-Ru Chen f8100451db Bug 1314254 - Add mozilla::ipc::IPCResult type and convert IPDL handlers to use new return type. r=billm
We will use the new type for the generated IPDL message handler
prototype to make sure correct error handling method is called.

MozReview-Commit-ID: AzVbApxFGZ0
2016-11-15 04:26:00 +01:00
Andrea Marchesini 2aba798852 Bug 1303518 - Remove the chrome only constructor for File, r=qdot 2016-11-11 18:56:44 +01:00
Andrea Marchesini 6674864b91 Bug 1315185 - Get rid of FileSystemFileEntry.createWriter, r=smaug 2016-11-04 14:23:46 +01:00
Andrea Marchesini 9188b61d96 Bug 1284987 - Entries API - part 6 - BlobCallback renamed, r=smaug 2016-11-03 07:57:34 +01:00
Andrea Marchesini a69d834b0d Bug 1284987 - Entries API - part 5 - Get rid of remove methods, r=smaug 2016-11-03 07:57:09 +01:00
Andrea Marchesini 05dea89997 Bug 1284987 - Entries API - part 4 - Use of DOMException, r=smaug 2016-11-03 07:56:28 +01:00
Andrea Marchesini d7a6ec8806 Bug 1284987 - Entries API - part 3 - FileSystemEntry.getParent recursion, r=smaug 2016-11-03 07:55:51 +01:00
Andrea Marchesini 3a9551a834 Bug 1284987 - Entries API - part 2 - FileSystemEntry.getParent, r=smaug 2016-11-03 07:55:30 +01:00
Andrea Marchesini 6db54bcb2f Bug 1284987 - Entries API - part 1 - DOMString to USVString, r=smaug 2016-11-03 07:55:17 +01:00
Andrea Marchesini d2e6e9c8f4 Bug 1305003 - Indentation fix in dom/filesystem/compat/*, r=me 2016-09-23 11:57:24 +02:00
Andrea Marchesini fd5175f4d1 Bug 1303638 - file.webkitRelativePath must contain the leafName of the parent directory, r=smaug 2016-09-22 13:48:46 +02:00
Andrea Marchesini e380831793 Bug 1287747 - GetFilesHelper must release mFiles and mGlobal on the main-thread, r=smaug 2016-09-17 09:55:30 +02:00
Andrea Marchesini 17d2053308 Bug 1287747 - GetFilesHelperParent must release ContentParent on the main-thread, r=smaug 2016-09-14 08:34:22 +02:00
Andrea Marchesini b5d19337d3 Bug 1287747 -GetFilesHelper must release callbacks and promises on the main-thread only, r=smaug 2016-09-11 09:56:54 +02:00
Nicholas Nethercote 34dcc7b852 Bug 1299384 - Use MOZ_MUST_USE with NS_warn_if_impl(). r=erahm.
This change avoids lots of false positives for Coverity's CHECKED_RETURN
warning, caused by NS_WARN_IF's current use in both statement-style and
expression-style.

In the case where the code within the NS_WARN_IF has side-effects, I made the
following change.

> NS_WARN_IF(NS_FAILED(FunctionWithSideEffects()));
> -->
> Unused << NS_WARN_IF(NS_FAILED(FunctionWithSideEffects()));

In the case where the code within the NS_WARN_IF lacks side-effects, I made the
following change.

> NS_WARN_IF(!condWithoutSideEffects);
> -->
> NS_WARNING_ASSERTION(condWithoutSideEffects, "msg");

This has two improvements.
- The condition is not evaluated in non-debug builds.
- The sense of the condition is inverted to the familiar "this condition should
  be true" sense used in assertions.

A common variation on the side-effect-free case is the following.

> nsresult rv = Fn();
> NS_WARN_IF_(NS_FAILED(rv));
> -->
> DebugOnly<nsresult rv> = Fn();
> NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Fn failed");

--HG--
extra : rebase_source : 58788245021096efa8372a9dc1d597a611d45611
2016-09-02 17:12:24 +10:00
Kan-Ru Chen b6d880aca1 Bug 1297276 - Rename mfbt/unused.h to mfbt/Unused.h for consistency. r=froydnj
The patch is generated from following command:

  rgrep -l unused.h|xargs sed -i -e s,mozilla/unused.h,mozilla/Unused.h,

MozReview-Commit-ID: AtLcWApZfES


--HG--
rename : mfbt/unused.h => mfbt/Unused.h
2016-08-24 14:47:04 +08:00
Andrea Marchesini 5bf9de08f0 Bug 1295570 - Entries API - part 7 - Split WebIDL files, r=smaug 2016-08-18 09:19:41 +02:00
Andrea Marchesini 87b1535dbc Bug 1295570 - Entries API - part 6 - Rename Entries Callbacks, r=smaug 2016-08-18 09:19:15 +02:00
Andrea Marchesini 8fb5264eef Bug 1295570 - Entries API - part 5 - Rename DirectoryReader to FileSystemDirectoryReader, r=smaug
--HG--
rename : dom/filesystem/compat/DirectoryReader.cpp => dom/filesystem/compat/FileSystemDirectoryReader.cpp
rename : dom/filesystem/compat/DirectoryReader.h => dom/filesystem/compat/FileSystemDirectoryReader.h
rename : dom/filesystem/compat/RootDirectoryReader.cpp => dom/filesystem/compat/FileSystemRootDirectoryReader.cpp
rename : dom/filesystem/compat/RootDirectoryReader.h => dom/filesystem/compat/FileSystemRootDirectoryReader.h
2016-08-18 09:18:51 +02:00
Andrea Marchesini de09eb6947 Bug 1295570 - Entries API - part 4 - Rename DirectoryEntry to FileSystemDirectoryEntry, r=smaug
--HG--
rename : dom/filesystem/compat/DirectoryEntry.cpp => dom/filesystem/compat/FileSystemDirectoryEntry.cpp
rename : dom/filesystem/compat/DirectoryEntry.h => dom/filesystem/compat/FileSystemDirectoryEntry.h
rename : dom/filesystem/compat/RootDirectoryEntry.cpp => dom/filesystem/compat/FileSystemRootDirectoryEntry.cpp
rename : dom/filesystem/compat/RootDirectoryEntry.h => dom/filesystem/compat/FileSystemRootDirectoryEntry.h
2016-08-18 09:18:05 +02:00
Andrea Marchesini e06457dcf2 Bug 1295570 - Entries API - part 3 - Rename FileEntry to FileSystemFileEntry, r=smaug
--HG--
rename : dom/filesystem/compat/FileEntry.cpp => dom/filesystem/compat/FileSystemFileEntry.cpp
rename : dom/filesystem/compat/FileEntry.h => dom/filesystem/compat/FileSystemFileEntry.h
2016-08-18 09:17:48 +02:00
Andrea Marchesini 94d10aeb4c Bug 1295570 - Entries API - part 2 - Rename Entry to FileSystemEntry, r=smaug
--HG--
rename : dom/filesystem/compat/Entry.cpp => dom/filesystem/compat/FileSystemEntry.cpp
rename : dom/filesystem/compat/Entry.h => dom/filesystem/compat/FileSystemEntry.h
2016-08-18 09:17:25 +02:00
Andrea Marchesini f0c18d080e Bug 1295570 - Entries API - part 1 - Rename DOMFileSystem to FileSystem, r=smaug
--HG--
rename : dom/filesystem/compat/DOMFileSystem.cpp => dom/filesystem/compat/FileSystem.cpp
rename : dom/filesystem/compat/DOMFileSystem.h => dom/filesystem/compat/FileSystem.h
rename : dom/webidl/DOMFileSystem.webidl => dom/webidl/FileSystem.webidl
2016-08-18 09:17:02 +02:00
Andrew Comminos 395c323784 Bug 1284742 - Replace profile directory traversal with a generated directory tree in dom/filesystem/test/test_basic.html. r=mystor
MozReview-Commit-ID: HSX9i5KDDEj

--HG--
extra : rebase_source : 7f95f6e9ca59f839c01be1cd75847aaa60cdf81c
2016-08-02 15:48:13 -04:00
Olli Pettay 47a98b8ad1 Bug 1289255 - Implement DataTransferItem.webkitGetAsEntry, r=baku
--HG--
extra : rebase_source : 10517eeb5b5a68204514527c8a904ab216df6534
2016-07-29 14:42:33 +03:00
Andrea Marchesini 10d10aa38d Bug 1274959 - Support symlinks in Directory API - part 3 - no loops with symlink in Directory.getFiles(), r=smaug 2016-07-23 10:35:26 +02:00
Andrea Marchesini 805b8ba685 Bug 1274959 - Support symlinks in Directory API - part 2 - Unify GetFilesHelper and GetFilesTaskParent, r=smaug 2016-07-23 10:35:06 +02:00
Andrea Marchesini ce2d912270 Bug 1274959 - Support symlinks in Directory API - part 1 - Directory.getFilesAndDirectories, r=smaug 2016-07-23 10:34:43 +02:00
Andrea Marchesini 3660cacdaf Bug 1288681 - Rename HTMLInputElement::directory to HTMLInputElement::allowdirs, r=smaug 2016-07-23 10:20:15 +02:00
Andrea Marchesini 60ab8339e0 Bug 1288736 - Add some missing rv.SuppressException(), r=smaug 2016-07-22 16:50:10 +02:00
Tom Tromey 5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Andrea Marchesini f01e7c5de3 Bug 1287169 - Fix intermittent failure in test_no_dnd.html, r=smaug 2016-07-16 08:29:31 +02:00
Andrea Marchesini 28249196c0 Bug 1186932 - Implement support for form submission of a picked directory - part 8 - explicit for GetFilesHelper, r=me 2016-07-14 09:32:59 +02:00
Andrea Marchesini 00723cb370 Bug 1186932 - Implement support for form submission of a picked directory - part 6 - GetFilesHelper executed on the parent process, r=smaug 2016-07-14 09:04:21 +02:00
Andrea Marchesini 3ef20ed60c Bug 1186932 - Implement support for form submission of a picked directory - part 5 - preferences enabled for testing, r=smaug 2016-07-14 09:03:35 +02:00
Andrea Marchesini fbe3bd5abf Bug 1186932 - Implement support for form submission of a picked directory - part 4 - Moving GetFilesHelper to separate files, r=smaug 2016-07-14 09:03:10 +02:00
Andrea Marchesini f8488defb9 Bug 1186932 - Implement support for form submission of a picked directory - part 3 - tests + fixes, r=smaug 2016-07-14 09:02:30 +02:00
Andrea Marchesini e0915741f1 Bug 1283344 - Enable dom/filesystem/test/test_worker_basic.html again, r=me 2016-07-08 10:07:05 +02:00
Andrea Marchesini 3054bd3c6a Bug 1283344 - Change the creation time of <input type="file"> in some dom/filesystem tests, r=me 2016-07-08 09:08:47 +02:00
Phil Ringnalda 32a933ec91 Bug 1283344 - disable dom/filesystem/tests/test_worker_basic.html for being number one with a bullet on the Orange Factor hit parade 2016-07-07 21:27:25 -07:00
Andrea Marchesini fca8c62260 Bug 1281545 - FileSystem Blink API tests should remove the test directory, r=smaug 2016-06-23 09:49:34 +02:00
Jonathan Watt b15368cfcb Bug 1279451 - Remove a lot of unnecessary includes of nsAutoPtr.h. rs=sparky 2016-06-07 21:10:18 +01:00
Andrea Marchesini 2a437d0c90 Bug 1265767 - Subset of Blink FileSystem API - patch 7 - DnD tests, r=smaug 2016-06-07 00:55:17 +02:00
Andrea Marchesini 64fb238b77 Bug 1265767 - Subset of Blink FileSystem API - patch 6 - getFile and getDirectory, r=smaug 2016-06-07 00:55:17 +02:00
Andrea Marchesini ae27692741 Bug 1265767 - Subset of Blink FileSystem API - patch 5 - DOMFileSystem, r=smaug
--HG--
rename : dom/filesystem/compat/ErrorCallbackRunnable.h => dom/filesystem/compat/CallbackRunnables.h
2016-06-07 00:55:17 +02:00
Andrea Marchesini 5a24e4a0ff Bug 1265767 - Subset of Blink FileSystem API - patch 4 - DirectoryEntry methods, r=smaug 2016-06-07 00:55:17 +02:00
Andrea Marchesini 52fbfbc75d Bug 1265767 - Subset of Blink FileSystem API - patch 3 - FileEntry methods, r=smaug 2016-06-07 00:55:17 +02:00
Andrea Marchesini 5a7749a26f Bug 1265767 - Subset of Blink FileSystem API - patch 2 - Entries, r=smaug 2016-06-07 00:55:16 +02:00
Andrea Marchesini 1a7f4ecbd2 Bug 1265767 - Subset of Blink FileSystem API - patch 1 - WebIDL, r=smaug 2016-06-07 00:55:16 +02:00
Andrea Marchesini cd3d7522dc Bug 1274999 - Stop GetFilesHelper runnable when the operation is canceled, r=smaug 2016-06-06 11:16:48 +02:00
Andrea Marchesini 3ad65f3a92 Bug 1258489 - Implement HTMLInputElement.webkitdirectory, r=smaug 2016-06-01 12:29:00 +02:00
Andrea Marchesini d3cf11f109 Bug 1261693 - Implement HTMLInputElement::GetFiles, r=smaug 2016-05-31 12:54:24 +02:00
Andrea Marchesini 2862e68070 Bug 1258633 - Increase the timeout for dom/filesystem tests, r=RyanVM 2016-05-30 16:01:47 +02:00
Wes Kocher 8bcdb6ce30 Backed out changeset 77c60a79313d (bug 1261693) for breaking test_basic.html on at least Android CLOSED TREE 2016-05-23 12:46:34 -07:00
Wes Kocher e089e1ab3e Backed out changeset 17e20404362d (bug 1258489) 2016-05-23 12:46:05 -07:00
Andrea Marchesini 6586afe162 Bug 1258489 - Implement HTMLInputElement.webkitdirectory, r=smaug 2016-05-23 17:02:18 +02:00
Andrea Marchesini d076c7faec Bug 1261693 - Implement HTMLInputElement::GetFiles, r=smaug 2016-05-23 17:00:45 +02:00
Chris Peterson 8a9e2d2bd4 Bug 1272513 - Part 2: Remove redundant -Wshadow CXXFLAGS from moz.build files. r=glandium 2016-05-14 00:54:55 -07:00
Andrea Marchesini e5ac72be11 Bug 1258490 - patch 3 - Fix Android error failures for root paths, r=me 2016-05-13 17:20:26 +02:00
Andrea Marchesini 598d0d9c4d Bug 1258490 - patch 2 - Directory::WebkitBlinkDirectoryPickerEnabled must be able to retrieve the WorkerPrivate also without having a JSContext, r=me 2016-05-13 14:38:00 +02:00
Andrea Marchesini c2b21ae750 Bug 1261694 - HTMLInputElement::GetFilesAndDirectories should return a new promise object, r=smaug 2016-05-13 13:12:34 +02:00
Andrea Marchesini 6441b9d372 Bug 1258490 - Implement file.webkitrelativepath, r=smaug 2016-05-13 13:11:38 +02:00
Kyle Huey c73656947b Bug 1265927: Move nsRunnable to mozilla::Runnable, CancelableRunnable to mozilla::CancelableRunnable. r=froydnj 2016-04-25 17:23:21 -07:00