##// END OF EJS Templates
a few 1 pixel fixes....
a few 1 pixel fixes. this uses the same html/css structure acroos the tabs, and reduce the overlay click zone that expended the size of the header to 25px instead of 24px

File last commit:

r19341:5982aa3f
r19703:6879cac4
Show More
editor.js
190 lines | 6.5 KiB | application/javascript | JavascriptLexer
Thomas Kluyver
Refactor editor into Editor class
r19013 // Copyright (c) IPython Development Team.
// Distributed under the terms of the Modified BSD License.
define([
'jquery',
'base/js/utils',
'codemirror/lib/codemirror',
'codemirror/mode/meta',
Min RK
editor progress...
r19303 'codemirror/addon/comment/comment',
'codemirror/addon/dialog/dialog',
'codemirror/addon/edit/closebrackets',
'codemirror/addon/edit/matchbrackets',
'codemirror/addon/search/searchcursor',
'codemirror/addon/search/search',
'codemirror/keymap/emacs',
'codemirror/keymap/sublime',
'codemirror/keymap/vim',
Thomas Kluyver
Refactor editor into Editor class
r19013 ],
function($,
utils,
CodeMirror
) {
Min RK
editor progress...
r19303 "use strict";
Min RK
add Mode menu to editor
r19319
Thomas Kluyver
Refactor editor into Editor class
r19013 var Editor = function(selector, options) {
Min RK
editor progress...
r19303 var that = this;
Thomas Kluyver
Refactor editor into Editor class
r19013 this.selector = selector;
this.contents = options.contents;
this.events = options.events;
this.base_url = options.base_url;
this.file_path = options.file_path;
Min RK
editor progress...
r19303 this.config = options.config;
this.codemirror = new CodeMirror($(this.selector)[0]);
Min RK
track dirty state in editor for onbeforeunload
r19304 this.generation = -1;
Thomas Kluyver
Refactor editor into Editor class
r19013
Thomas Kluyver
Better way of saving through CodeMirror...
r19020 // It appears we have to set commands on the CodeMirror class, not the
// instance. I'd like to be wrong, but since there should only be one CM
// instance on the page, this is good enough for now.
CodeMirror.commands.save = $.proxy(this.save, this);
Thomas Kluyver
Update text editor for new contents API
r19015 this.save_enabled = false;
Min RK
editor progress...
r19303
this.config.loaded.then(function () {
// load codemirror config
var cfg = that.config.data.Editor || {};
var cmopts = $.extend(true, {}, // true = recursive copy
Editor.default_codemirror_options,
cfg.codemirror_options || {}
);
Min RK
fixup
r19309 that._set_codemirror_options(cmopts);
Min RK
editor progress...
r19303 that.events.trigger('config_changed.Editor', {config: that.config});
});
};
// default CodeMirror options
Editor.default_codemirror_options = {
extraKeys: {
"Tab" : "indentMore",
},
indentUnit: 4,
theme: "ipython",
lineNumbers: true,
Min RK
wrap lines by default...
r19341 lineWrapping: true,
Thomas Kluyver
Refactor editor into Editor class
r19013 };
Editor.prototype.load = function() {
Min RK
editor progress...
r19303 /** load the file */
Thomas Kluyver
Update text editor for new contents API
r19015 var that = this;
Thomas Kluyver
Refactor editor into Editor class
r19013 var cm = this.codemirror;
Min RK
editor progress...
r19303 return this.contents.get(this.file_path, {type: 'file', format: 'text'})
Thomas Kluyver
Update text editor for new contents API
r19015 .then(function(model) {
cm.setValue(model.content);
Scott Sanderson
BUG: Prevent users from undoing the initial document load with CTRL-Z....
r19089
// Setting the file's initial value creates a history entry,
// which we don't want.
cm.clearHistory();
Min RK
update mode on rename
r19321 that._set_mode_for_model(model);
Thomas Kluyver
Update text editor for new contents API
r19015 that.save_enabled = true;
Min RK
track dirty state in editor for onbeforeunload
r19304 that.generation = cm.changeGeneration();
Min RK
add save widget to text editor
r19316 that.events.trigger("file_loaded.Editor", model);
Thomas Kluyver
Update text editor for new contents API
r19015 },
function(error) {
Min RK
redirect /edit/ to /files/ if not (utf8) text
r19337 that.events.trigger("file_load_failed.Editor", error);
if (error.xhr.responseJSON.reason === 'bad format') {
window.location = utils.url_path_join(
that.base_url,
'files',
that.file_path
);
}
Thomas Kluyver
Update text editor for new contents API
r19015 cm.setValue("Error! " + error.message +
"\nSaving disabled.");
that.save_enabled = false;
Thomas Kluyver
Refactor editor into Editor class
r19013 }
Thomas Kluyver
Update text editor for new contents API
r19015 );
Thomas Kluyver
Refactor editor into Editor class
r19013 };
Min RK
update mode on rename
r19321
Editor.prototype._set_mode_for_model = function (model) {
/** Set the CodeMirror mode based on the file model */
// Find and load the highlighting mode,
// first by mime-type, then by file extension
var modeinfo = CodeMirror.findModeByMIME(model.mimetype);
if (modeinfo.mode === "null") {
// find by mime failed, use find by ext
var ext_idx = model.name.lastIndexOf('.');
if (ext_idx > 0) {
// CodeMirror.findModeByExtension wants extension without '.'
modeinfo = CodeMirror.findModeByExtension(model.name.slice(ext_idx + 1));
}
}
if (modeinfo) {
this.set_codemirror_mode(modeinfo);
}
};
Min RK
add save widget to text editor
r19316
Min RK
add Mode menu to editor
r19319 Editor.prototype.set_codemirror_mode = function (modeinfo) {
/** set the codemirror mode from a modeinfo struct */
var that = this;
utils.requireCodeMirrorMode(modeinfo, function () {
that.codemirror.setOption('mode', modeinfo.mode);
that.events.trigger("mode_changed.Editor", modeinfo);
});
};
Min RK
add save widget to text editor
r19316 Editor.prototype.get_filename = function () {
return utils.url_path_split(this.file_path)[1];
Min RK
add Mode menu to editor
r19319 };
Thomas Kluyver
Refactor editor into Editor class
r19013
Min RK
add save widget to text editor
r19316 Editor.prototype.rename = function (new_name) {
/** rename the file */
var that = this;
var parent = utils.url_path_split(this.file_path)[0];
var new_path = utils.url_path_join(parent, new_name);
return this.contents.rename(this.file_path, new_path).then(
Min RK
update mode on rename
r19321 function (model) {
that.file_path = model.path;
that.events.trigger('file_renamed.Editor', model);
that._set_mode_for_model(model);
Min RK
add save widget to text editor
r19316 }
);
};
Editor.prototype.save = function () {
Min RK
editor progress...
r19303 /** save the file */
Thomas Kluyver
Update text editor for new contents API
r19015 if (!this.save_enabled) {
console.log("Not saving, save disabled");
return;
}
Thomas Kluyver
Refactor editor into Editor class
r19013 var model = {
Thomas Kluyver
Update text editor for new contents API
r19015 path: this.file_path,
Thomas Kluyver
Refactor editor into Editor class
r19013 type: 'file',
format: 'text',
content: this.codemirror.getValue(),
};
var that = this;
Min RK
track dirty state in editor for onbeforeunload
r19304 // record change generation for isClean
this.generation = this.codemirror.changeGeneration();
Min RK
add save widget to text editor
r19316 return this.contents.save(this.file_path, model).then(function(data) {
that.events.trigger("file_saved.Editor", data);
Thomas Kluyver
Refactor editor into Editor class
r19013 });
};
Min RK
editor progress...
r19303
Editor.prototype._set_codemirror_options = function (options) {
// update codemirror options from a dict
Min RK
use $.map for setting cm options
r19334 var codemirror = this.codemirror;
$.map(options, function (value, opt) {
Min RK
setting an option to null sets the default in CodeMirror...
r19311 if (value === null) {
value = CodeMirror.defaults[opt];
}
Min RK
use $.map for setting cm options
r19334 codemirror.setOption(opt, value);
});
Min RK
editor progress...
r19303 };
Editor.prototype.update_codemirror_options = function (options) {
/** update codemirror options locally and save changes in config */
var that = this;
this._set_codemirror_options(options);
return this.config.update({
Editor: {
codemirror_options: options
}
}).then(
that.events.trigger('config_changed.Editor', {config: that.config})
);
};
Thomas Kluyver
Refactor editor into Editor class
r19013
return {Editor: Editor};
});