p2yq6ufca
/
monkeyking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added heading and slideshow scroll managers

Browse Source
Jonathan Frederic 12 years ago
parent 7e7683a587
commit 8617696c5b
3 changed files with 67 additions and 86 deletions
Show Stats Download Patch File Download Diff File

28
IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js
Unescape View File

@ -11,24 +11,6 @@ define([
var CellToolbar = celltoolbar.CellToolbar;
var slideshow_preset = [];
var _update_cell = function(cell, old_slide_class) {
// Remove the old slide DOM class if set.
if (old_slide_class && old_slide_class != '-') {
cell.element.removeClass('slideshow-'+old_slide_class);
}
// add a DOM class to the cell
var value = _get_cell_type(cell);
if (value != '-') { cell.element.addClass('slideshow-'+value); }
};
var _get_cell_type = function(cell) {
var ns = cell.metadata.slideshow;
// if the slideshow namespace does not exist return `undefined`
// (will be interpreted as `false` by checkbox) otherwise
// return the value
return (ns === undefined)? undefined: ns.slide_type;
};
var select_type = CellToolbar.utils.select_ui_generator([
["-" ,"-" ],
["Slide" ,"slide" ],
@ -42,13 +24,15 @@ define([
// we check that the slideshow namespace exist and create it if needed
if (cell.metadata.slideshow === undefined){cell.metadata.slideshow = {};}
// set the value
var old = cell.metadata.slideshow.slide_type;
cell.metadata.slideshow.slide_type = value;
// update the slideshow class set on the cell
_update_cell(cell, old);
},
//geter
_get_cell_type,
function(cell){ var ns = cell.metadata.slideshow;
// if the slideshow namespace does not exist return `undefined`
// (will be interpreted as `false` by checkbox) otherwise
// return the value
return (ns === undefined)? undefined: ns.slide_type;
},
"Slide Type");
var register = function (notebook) {

2
IPython/html/static/notebook/js/notebook.js
Unescape View File

@ -1625,7 +1625,7 @@ define([
this._session_starting = false;
utils.log_ajax_error(jqxhr, status, error);
};
/**
* Prompt the user to restart the IPython kernel.
*

123
IPython/html/static/notebook/js/scrollmanager.js
Unescape View File

@ -27,7 +27,7 @@ define(['jquery'], function($){
var that = this;
this._combo.change(function(){
var manager = that._registered[$(this).find("option:selected").val()];
that.notebook.ScrollSelector = manager;
that.notebook.scrollmanager = manager;
});
};
@ -80,97 +80,94 @@ define(['jquery'], function($){
// is found. To guess the index, get the top of the last cell, and
// divide that by the number of cells to get an average cell height.
// Then divide the scroll height by the average cell height.
var cell_count = that.notebook.ncells();
var first_cell_top = that.notebook.get_cell(0).element.offset.top();
var last_cell_top = that.notebook.get_cell(cell_count-1).element.offset.top();
var cell_count = this.notebook.ncells();
var first_cell_top = this.notebook.get_cell(0).element.offset().top;
var last_cell_top = this.notebook.get_cell(cell_count-1).element.offset().top;
var avg_cell_height = (last_cell_top - first_cell_top) / cell_count;
var $notebook = $('#notebook').scrollTop();
var i = Math.ceil($notebook.scrollTop() / avg_cell_height);
i = min(max(i , 0), cell_count - 1);
var notebook = $('#notebook');
var i = Math.ceil(notebook.scrollTop() / avg_cell_height);
i = Math.min(Math.max(i , 0), cell_count - 1);
while (that.notebook.get_cell(i).element.offset.top() - first_cell_top < $notebook.scrollTop() && i < cell_count - 1) {
while (this.notebook.get_cell(i).element.offset().top - first_cell_top < notebook.scrollTop() && i < cell_count - 1) {
i += 1;
}
while (that.notebook.get_cell(i).element.offset.top() - first_cell_top > $notebook.scrollTop() && i >= 0) {
while (this.notebook.get_cell(i).element.offset().top - first_cell_top > notebook.scrollTop() - 50 && i >= 0) {
i -= 1;
}
return min(i + 1, cell_count - 1);
return Math.min(i + 1, cell_count - 1);
};
var HeadingScrollManager = function(notebook, heading_level) {
var TargetScrollManager = function(notebook) {
// Public constructor.
ScrollManager.apply(this, [notebook]);
};
TargetScrollManager.prototype = new ScrollManager();
var SlideScrollManager = function(notebook) {
// Public constructor.
TargetScrollManager.prototype.is_target = function (index) {
return false;
};
/*// Scroll the document.
TargetScrollManager.prototype.scroll = function (delta) {
// Scroll the document.
//
// Parameters
// ----------
// delta: integer
// direction to scroll the document. Positive is downwards.
// If one or more slides exist, scroll to the slide.
var $slide_cells = $('.slideshow-slide');
if ($slide_cells.length > 0) {
var i, cell;
// Get the active slide cell index.
var selected_index = this.notebook.find_cell_index(this.notebook.get_selected_cell());
var active_slide = -1;
var cells = this.notebook.get_cells();
for (i = selected_index; i >= 0; i--) {
cell = cells[i];
var ns = cell.metadata.slideshow;
if (ns && ns.slide_type == 'slide') {
active_slide = i;
break;
}
}
// Translate cell index into slide cell index.
if (active_slide != -1) {
for (i = 0; i < $slide_cells.length; i++) {
if (cells[active_slide].element[0] == $slide_cells[i]) {
active_slide = i;
break;
}
}
}
// Scroll.
if (active_slide != -1 || delta > 0) {
active_slide += delta;
active_slide = Math.max(0, Math.min($slide_cells.length-1, active_slide));
var cell_element = $slide_cells[active_slide];
cell = $(cell_element).data('cell');
this.notebook.select(this.notebook.find_cell_index(cell));
this.scroll_to(cell_element);
//cell_element.scrollIntoView(true);
}
// Try to scroll to the next slide.
var cell_count = this.notebook.ncells();
var selected_index = this.get_first_visible_cell() + delta;
while (0 <= selected_index && selected_index < cell_count && !this.is_target(selected_index)) {
selected_index += delta;
}
// Cancel browser keyboard scroll.
return false;
// No slides exist, scroll up or down one page height. Instead of using
// the browser's built in method to do this, animate it using jQuery.
if (selected_index < 0 || cell_count <= selected_index) {
return ScrollManager.prototype.scroll.apply(this, [delta]);
} else {
this.scroll_some(delta);
this.scroll_to(this.notebook.get_cell(selected_index).element);
// Cancel browser keyboard scroll.
return false;
}*/
}
};
var SlideScrollManager = function(notebook) {
// Public constructor.
TargetScrollManager.apply(this, [notebook]);
};
SlideScrollManager.prototype = new TargetScrollManager();
SlideScrollManager.prototype.is_target = function (index) {
var cell = this.notebook.get_cell(index);
return cell.metadata && cell.metadata.slideshow &&
cell.metadata.slideshow.slide_type &&
cell.metadata.slideshow.slide_type === "slide";
};
var HeadingScrollManager = function(notebook, heading_level) {
// Public constructor.
TargetScrollManager.apply(this, [notebook]);
this._level = heading_level;
};
HeadingScrollManager.prototype = new TargetScrollManager();
HeadingScrollManager.prototype.is_target = function (index) {
var cell = this.notebook.get_cell(index);
return cell.cell_type === "heading" && cell.level == this._level;
};
// Return naemspace for require.js loads
return {
'ScrollSelector': ScrollSelector,
'ScrollManager': ScrollManager,
'SlideScrollManager': SlideScrollManager,
'HeadingScrollManager': HeadingScrollManager
'HeadingScrollManager': HeadingScrollManager,
'TargetScrollManager': TargetScrollManager
};
});

Write Preview
Loading…
Cancel
Save