Skip to content

Commit

Permalink
Fixed #9 yet again.
Browse files Browse the repository at this point in the history
  • Loading branch information
andris-sevcenko committed Jul 25, 2018
1 parent 3ba43bd commit 0087679
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,9 @@

## Unreleased

### Fixed
- Fixed a bug where the fixed toolbar _still_ was not working. ([#9]((https://github.com/craftcms/redactor/issues/9))

### 2.1.3 - 2018-07-25

- Fixed a bug where the fixed toolbar was not working. ([#9]((https://github.com/craftcms/redactor/issues/9))
Expand Down
2 changes: 1 addition & 1 deletion src/assets/field/dist/js/RedactorInput.js
Expand Up @@ -93,7 +93,7 @@

if (typeof this.redactorConfig.toolbarFixed === 'undefined' || this.redactorConfig.toolbarFixed) {
// Set the toolbarFixedTarget depending on the context
var target = this.$textarea.closest('#content-container, .lp-editor');
var target = this.$textarea.closest('#content, .lp-editor');
if (target.length) {
this.redactorConfig.toolbarFixedTarget = target;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/field/dist/js/RedactorInput.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/field/dist/js/RedactorInput.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/field/dist/js/RedactorOverrides.js
Expand Up @@ -84,7 +84,7 @@ toolbarFixedClass.prototype._doFixed = function() {

// Fix figuring out when to pin the toolbar and when not.
var toolbarHeight = $toolbar.height();
var toleranceEnd = 60;
var toleranceEnd = 100;
var containerOffset = $container.offset();
var boxOffset = containerOffset.top;
var scrollOffset = this.$fixedTarget.scrollTop();
Expand Down
2 changes: 1 addition & 1 deletion src/assets/field/dist/js/RedactorOverrides.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0087679

Please sign in to comment.