Skip to content

Commit

Permalink
Fixed #91, #187.
Browse files Browse the repository at this point in the history
  • Loading branch information
hackerwins committed Jan 26, 2014
1 parent 1cb74f4 commit 60800ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
5 changes: 4 additions & 1 deletion src/js/EventHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,10 @@ define([
oLayoutInfo.editable.on('keyup mouseup', hToolbarAndPopoverUpdate);
oLayoutInfo.editable.on('scroll', hScroll);

attachDragAndDropEvent(oLayoutInfo);
// Doesn't attach `dragAndDrop` event when `options.disableDragAndDrop` is true
if (!options.disableDragAndDrop) {
attachDragAndDropEvent(oLayoutInfo);
}

oLayoutInfo.handle.on('mousedown', hHandleMousedown);
oLayoutInfo.toolbar.on('click', hToolbarAndPopoverClick);
Expand Down
9 changes: 5 additions & 4 deletions src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ require([
], function ($) {
// summernote
$('.summernote').summernote({
height: 300,
focus: true,
tabsize: 2,
codemirror: {
height: 300, // set editable area's height
focus: true, // set focus editable area after summernote loaded
tabsize: 2, // size of tab
// disableDragAndDrop: false, // disable drag and drop event
codemirror: { // code mirror options
theme: 'monokai'
}
});
Expand Down

0 comments on commit 60800ec

Please sign in to comment.