From e1086e40a8271b30488f70935f26caff2a9cde43 Mon Sep 17 00:00:00 2001
From: Prithvi Prabhu <prithvi@0xdata.com>
Date: Thu, 8 Jan 2015 16:39:06 -0800
Subject: [PATCH] Bump version

---
 bower.json                          |  2 +-
 build/index.html                    | 14 ++++++++++++++
 build/js/flow.js                    | 15 ++++++++++-----
 src/core/components/notebook.coffee |  5 +++++
 src/core/components/notebook.jade   |  1 +
 src/ext/modules/proxy.coffee        |  4 ++--
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index cae0d1986..98835a194 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "h2o-flow",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "homepage": "https://github.com/h2oai/h2o-flow",
   "authors": [
     "Prithvi Prabhu <prithvi@h2o.ai>"
diff --git a/build/index.html b/build/index.html
index 40bfdb102..2b3de87f9 100644
--- a/build/index.html
+++ b/build/index.html
@@ -108,6 +108,20 @@ <h5>Edit Mode</h5>
       </div>
     </div>
     <!-- /ko-->
+    <div id="aboutDialog" tabindex="-1" role="dialog" aria-labelledby="aboutDialogLabel" aria-hidden="true" class="modal fade">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" data-dismiss="modal" class="close"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+            <h4 id="aboutDialogLabel" class="modal-title">Flow v0.2.19</h4>
+          </div>
+          <div class="modal-body"></div>
+          <div class="modal-footer">
+            <button type="button" data-dismiss="modal" class="btn btn-default">Close</button>
+          </div>
+        </div>
+      </div>
+    </div>
     <!-- /ko-->
     <script type="text/html" id="flow-keyboard-shortcut-table">
       <table>
diff --git a/build/js/flow.js b/build/js/flow.js
index 1472092d8..2e9e813a1 100755
--- a/build/js/flow.js
+++ b/build/js/flow.js
@@ -564,7 +564,7 @@
         };
     };
     Flow.Notebook = function (_, _renderers) {
-        var checkConsistency, clearAllCells, clearCell, cloneCell, convertCellToCode, convertCellToHeading, convertCellToMarkdown, convertCellToRaw, copyCell, createCell, createMenu, createMenuItem, createNotebook, createTool, cutCell, deleteCell, deserialize, displayKeyboardShortcuts, duplicateNotebook, editModeKeyboardShortcuts, editModeKeyboardShortcutsHelp, editTitle, goToUrl, initialize, insertAbove, insertBelow, insertCell, insertCellAbove, insertCellAboveAndRun, insertCellBelow, insertCellBelowAndRun, insertNewCellAbove, insertNewCellBelow, menuDivider, mergeCellAbove, mergeCellBelow, moveCellDown, moveCellUp, normalModeKeyboardShortcuts, normalModeKeyboardShortcutsHelp, notImplemented, pasteCellAbove, pasteCellBelow, pasteCellandReplace, printPreview, removeCell, runAllCells, runCell, runCellAndInsertBelow, runCellAndSelectBelow, saveNotebook, saveTitle, selectCell, selectNextCell, selectPreviousCell, serialize, setupKeyboardHandling, showBrowser, showClipboard, showHelp, showOutline, splitCell, startTour, switchToCommandMode, switchToEditMode, switchToPresentationMode, toKeyboardHelp, toggleAllInputs, toggleAllOutputs, toggleInput, toggleOutput, toggleSidebar, undoLastDelete, _areInputsHidden, _areOutputsHidden, _cells, _clipboardCell, _createdDate, _id, _isEditingTitle, _isSidebarHidden, _lastDeletedCell, _menus, _modifiedDate, _selectedCell, _selectedCellIndex, _sidebar, _status, _title, _toolbar;
+        var checkConsistency, clearAllCells, clearCell, cloneCell, convertCellToCode, convertCellToHeading, convertCellToMarkdown, convertCellToRaw, copyCell, createCell, createMenu, createMenuItem, createNotebook, createTool, cutCell, deleteCell, deserialize, displayAbout, displayKeyboardShortcuts, duplicateNotebook, editModeKeyboardShortcuts, editModeKeyboardShortcutsHelp, editTitle, goToUrl, initialize, insertAbove, insertBelow, insertCell, insertCellAbove, insertCellAboveAndRun, insertCellBelow, insertCellBelowAndRun, insertNewCellAbove, insertNewCellBelow, menuDivider, mergeCellAbove, mergeCellBelow, moveCellDown, moveCellUp, normalModeKeyboardShortcuts, normalModeKeyboardShortcutsHelp, notImplemented, pasteCellAbove, pasteCellBelow, pasteCellandReplace, printPreview, removeCell, runAllCells, runCell, runCellAndInsertBelow, runCellAndSelectBelow, saveNotebook, saveTitle, selectCell, selectNextCell, selectPreviousCell, serialize, setupKeyboardHandling, showBrowser, showClipboard, showHelp, showOutline, splitCell, startTour, switchToCommandMode, switchToEditMode, switchToPresentationMode, toKeyboardHelp, toggleAllInputs, toggleAllOutputs, toggleInput, toggleOutput, toggleSidebar, undoLastDelete, _areInputsHidden, _areOutputsHidden, _cells, _clipboardCell, _createdDate, _id, _isEditingTitle, _isSidebarHidden, _lastDeletedCell, _menus, _modifiedDate, _selectedCell, _selectedCellIndex, _sidebar, _status, _title, _toolbar;
         _id = Flow.Dataflow.signal('');
         _title = Flow.Dataflow.signal('Untitled Flow');
         _createdDate = Flow.Dataflow.signal(new Date());
@@ -910,6 +910,9 @@
         displayKeyboardShortcuts = function () {
             return $('#keyboardShortcutsDialog').modal();
         };
+        displayAbout = function () {
+            return $('#aboutDialog').modal();
+        };
         showHelp = function () {
             _isSidebarHidden(false);
             return _.showHelp();
@@ -1040,7 +1043,9 @@
                 createMenuItem('Keyboard Shortcuts', displayKeyboardShortcuts),
                 menuDivider,
                 createMenuItem('H2O Documentation', goToUrl('http://docs.h2o.ai/')),
-                createMenuItem('h2o.ai', goToUrl('http://h2o.ai/'))
+                createMenuItem('h2o.ai', goToUrl('http://h2o.ai/')),
+                menuDivider,
+                createMenuItem('About', displayAbout)
             ])
         ];
         createTool = function (icon, label, action, isDisabled) {
@@ -2891,7 +2896,7 @@
         closeTag = '</' + name + '>';
         if (type === '=') {
             return function (content) {
-                return beginTag + (content || '') + closeTag;
+                return beginTag + (content !== null && content !== void 0 ? content : '') + closeTag;
             };
         } else if (type === '+') {
             return function (content, arg0) {
@@ -4112,7 +4117,7 @@
             });
         };
         requestFrame = function (key, go) {
-            return doGet('/3/Frames/' + encodeURIComponent(key), function (error, result) {
+            return doGet('/3/Frames.json/' + encodeURIComponent(key), function (error, result) {
                 if (error) {
                     return go(error);
                 } else {
@@ -4121,7 +4126,7 @@
             });
         };
         requestColumnSummary = function (key, column, go) {
-            return doGet('/3/Frames/' + encodeURIComponent(key) + '/columns/' + encodeURIComponent(column) + '/summary', function (error, result) {
+            return doGet('/3/Frames.json/' + encodeURIComponent(key) + '/columns/' + encodeURIComponent(column) + '/summary', function (error, result) {
                 if (error) {
                     return go(error);
                 } else {
diff --git a/src/core/components/notebook.coffee b/src/core/components/notebook.coffee
index 063ea59e6..6c2d6d955 100644
--- a/src/core/components/notebook.coffee
+++ b/src/core/components/notebook.coffee
@@ -288,6 +288,9 @@ Flow.Notebook = (_, _renderers) ->
   displayKeyboardShortcuts = ->
     $('#keyboardShortcutsDialog').modal()
 
+  displayAbout = ->
+    $('#aboutDialog').modal()
+
   showHelp = ->
     _isSidebarHidden no
     _.showHelp()
@@ -422,6 +425,8 @@ Flow.Notebook = (_, _renderers) ->
       menuDivider
       createMenuItem 'H2O Documentation', goToUrl 'http://docs.h2o.ai/'
       createMenuItem 'h2o.ai', goToUrl 'http://h2o.ai/'
+      menuDivider
+      createMenuItem 'About', displayAbout
     ]
   ]
 
diff --git a/src/core/components/notebook.jade b/src/core/components/notebook.jade
index fab8c64bf..27dea0936 100644
--- a/src/core/components/notebook.jade
+++ b/src/core/components/notebook.jade
@@ -17,6 +17,7 @@
     include navigation.jade
 
 include keyboard-help-dialog.jade    
+include about-dialog.jade    
 // /ko
 
 //- 
diff --git a/src/ext/modules/proxy.coffee b/src/ext/modules/proxy.coffee
index 34995dffd..e3b215cc4 100644
--- a/src/ext/modules/proxy.coffee
+++ b/src/ext/modules/proxy.coffee
@@ -60,14 +60,14 @@ H2O.Proxy = (_) ->
         go null, result.frames
 
   requestFrame = (key, go) ->
-    doGet "/3/Frames/#{encodeURIComponent key}", (error, result) ->
+    doGet "/3/Frames.json/#{encodeURIComponent key}", (error, result) ->
       if error
         go error
       else
         go null, head result.frames
 
   requestColumnSummary = (key, column, go) ->
-    doGet "/3/Frames/#{encodeURIComponent key}/columns/#{encodeURIComponent column}/summary", (error, result) ->
+    doGet "/3/Frames.json/#{encodeURIComponent key}/columns/#{encodeURIComponent column}/summary", (error, result) ->
       if error
         go error
       else