Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: madwire/hallo
base: c10fc5be2c
...
head fork: madwire/hallo
compare: 815e0ccd43
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 6 additions and 8 deletions.
  1. +5 −7 src/toolbar/fixed.coffee
  2. +1 −1  src/widgets/button.coffee
View
12 src/toolbar/fixed.coffee
@@ -31,17 +31,15 @@
widthToAdd += parseFloat el.css('padding-right')
widthToAdd += parseFloat el.css('border-left-width')
widthToAdd += parseFloat el.css('border-right-width')
- widthToAdd += (parseFloat el.css('outline-width')) * 2
- widthToAdd += (parseFloat el.css('outline-offset')) * 2
+ try
+ widthToAdd += (parseFloat el.css('outline-width')) * 2
+ widthToAdd += (parseFloat el.css('outline-offset')) * 2
jQuery(@toolbar).css "width", el.width() + widthToAdd
_getPosition: (event, selection) ->
- return unless event
- width = parseFloat @element.css 'outline-width'
- offset = width + parseFloat @element.css 'outline-offset'
return position =
- top: @element.offset().top - @toolbar.outerHeight() - offset
- left: @element.offset().left - offset
+ top: 0
+ left: 0
_getCaretPosition: (range) ->
tmpSpan = jQuery "<span/>"
View
2  src/widgets/button.coffee
@@ -64,7 +64,7 @@
@options.editable.execute @options.command, @options.commandValue
else
@options.editable.execute @options.command
- queryState
+ queryState()
return false
return unless @options.queryState

No commit comments for this range

Something went wrong with that request. Please try again.