Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@lo5
lo5 committed Jan 9, 2015
1 parent 1e93e79 commit e1086e4
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
Expand Down
14 changes: 14 additions & 0 deletions build/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 10 additions & 5 deletions build/js/flow.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -910,6 +910,9 @@
displayKeyboardShortcuts = function () {
return $('#keyboardShortcutsDialog').modal();
};
displayAbout = function () {
return $('#aboutDialog').modal();
};
showHelp = function () {
_isSidebarHidden(false);
return _.showHelp();
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions src/core/components/notebook.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ Flow.Notebook = (_, _renderers) ->
displayKeyboardShortcuts = ->
$('#keyboardShortcutsDialog').modal()

displayAbout = ->
$('#aboutDialog').modal()

showHelp = ->
_isSidebarHidden no
_.showHelp()
Expand Down Expand Up @@ -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
]
]

Expand Down
1 change: 1 addition & 0 deletions src/core/components/notebook.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
include navigation.jade

include keyboard-help-dialog.jade
include about-dialog.jade
// /ko
//-
Expand Down
4 changes: 2 additions & 2 deletions src/ext/modules/proxy.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1086e4

Please sign in to comment.