Skip to content
Permalink
Browse files

Merge branch 't/10112' into major

  • Loading branch information...
Reinmar committed Feb 22, 2013
2 parents ca74c3c + 1e9fc04 commit eaf5e738a01684c5bfe582549878cb5fdf5d7ed8
Showing with 6 additions and 2 deletions.
  1. +6 −2 plugins/floatingspace/plugin.js
@@ -73,6 +73,11 @@
mode = newMode;
}

var editable = editor.editable();
// #10112 Do not fail on editable-less editor.
if ( !editable )
return;

// Show up the space on focus gain.
evt.name == 'focus' && floatSpace.show();

@@ -85,8 +90,7 @@
// available for all, it's safe to figure that out from the rest.

// http://help.dottoro.com/ljgupwlp.php
var editable = editor.editable(),
spaceRect = floatSpace.getClientRect(),
var spaceRect = floatSpace.getClientRect(),
editorRect = editable.getClientRect(),
spaceHeight = spaceRect.height,
pageScrollX = scrollOffset( 'left' );

0 comments on commit eaf5e73

Please sign in to comment.
You can’t perform that action at this time.