From e558e1aeb878162316c3793b70e786ddcc16b938 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 27 Jan 2015 12:09:06 +0100
Subject: [PATCH 1/2] refactor imports

---
 IPython/html/static/notebook/js/notebook.js | 64 +++++++--------------
 1 file changed, 21 insertions(+), 43 deletions(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 4b61d8f3c..3c82ca6c0 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -4,50 +4,28 @@
 /**
  * @module notebook
  */
-define([
-    'base/js/namespace',
-    'jquery',
-    'base/js/utils',
-    'base/js/dialog',
-    'notebook/js/cell',
-    'notebook/js/textcell',
-    'notebook/js/codecell',
-    'services/config',
-    'services/sessions/session',
-    'notebook/js/celltoolbar',
-    'components/marked/lib/marked',
-    'codemirror/lib/codemirror',
-    'codemirror/addon/runmode/runmode',
-    'notebook/js/mathjaxutils',
-    'base/js/keyboard',
-    'notebook/js/tooltip',
-    'notebook/js/celltoolbarpresets/default',
-    'notebook/js/celltoolbarpresets/rawcell',
-    'notebook/js/celltoolbarpresets/slideshow',
-    'notebook/js/scrollmanager'
-], function (
-    IPython, 
-    $,
-    utils,
-    dialog,
-    cellmod,
-    textcell,
-    codecell,
-    configmod,
-    session, 
-    celltoolbar,
-    marked,
-    CodeMirror,
-    runMode,
-    mathjaxutils,
-    keyboard,
-    tooltip,
-    default_celltoolbar,
-    rawcell_celltoolbar,
-    slideshow_celltoolbar,
-    scrollmanager
-    ) {
+define(function (require) {
     "use strict";
+    var IPython = require('base/js/namespace');
+    var $ = require('jquery');
+    var utils = require('base/js/utils');
+    var dialog = require('base/js/dialog');
+    var cellmod = require('notebook/js/cell');
+    var textcell = require('notebook/js/textcell');
+    var codecell = require('notebook/js/codecell');
+    var configmod = require('services/config');
+    var session = require('services/sessions/session');
+    var celltoolbar = require('notebook/js/celltoolbar');
+    var marked = require('components/marked/lib/marked');
+    var CodeMirror = require('codemirror/lib/codemirror');
+    var runMode = require('codemirror/addon/runmode/runmode');
+    var mathjaxutils = require('notebook/js/mathjaxutils');
+    var keyboard = require('base/js/keyboard');
+    var tooltip = require('notebook/js/tooltip');
+    var default_celltoolbar = require('notebook/js/celltoolbarpresets/default');
+    var rawcell_celltoolbar = require('notebook/js/celltoolbarpresets/rawcell');
+    var slideshow_celltoolbar = require('notebook/js/celltoolbarpresets/slideshow');
+    var scrollmanager = require('notebook/js/scrollmanager');
 
     /**
      * Contains and manages cells.

From 729b0922b1d59b1e5678a6fef6ee2c11baf2ae98 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 27 Jan 2015 12:18:26 +0100
Subject: [PATCH 2/2] Parse Date with moment.js or Because Date(str) return
 Now()

Also so relative date in confirmation dialog because It's easier to
parse mentally.

Closes #7535
---
 IPython/html/static/notebook/js/notebook.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 3c82ca6c0..281ce3ab0 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -13,6 +13,7 @@ define(function (require) {
     var cellmod = require('notebook/js/cell');
     var textcell = require('notebook/js/textcell');
     var codecell = require('notebook/js/codecell');
+    var moment = require('moment');
     var configmod = require('services/config');
     var session = require('services/sessions/session');
     var celltoolbar = require('notebook/js/celltoolbar');
@@ -2341,7 +2342,8 @@ define(function (require) {
             $('<p/>').addClass("p-space").text("The checkpoint was last updated at:")
         ).append(
             $('<p/>').addClass("p-space").text(
-                Date(checkpoint.last_modified)
+                moment(checkpoint.last_modified).format('LLLL') +
+                ' ('+moment(checkpoint.last_modified).fromNow()+')'// Long form:  Tuesday, January 27, 2015 12:15 PM
             ).css("text-align", "center")
         );