forked from mycolorway/simditor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1e4c111
commit 2c6bb22
Showing
5 changed files
with
46 additions
and
53 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -139,7 +139,7 @@ class ImageButton extends Button | |
| return unless $img.hasClass('uploading') | ||
| src = if img then img.src else @defaultImage | ||
|
|
||
| @loadImage $img, src, () => | ||
| @loadImage $img, src, => | ||
| @popover.refresh() | ||
| @popover.srcEl.val('正在上传...') | ||
| .prop('disabled', true) | ||
|
|
@@ -229,20 +229,12 @@ class ImageButton extends Button | |
| $mask = $img.data('mask') | ||
| if !$mask | ||
| $mask = $('<div class="simditor-image-loading"><span></span></div>') | ||
| .hide() | ||
| .appendTo(@editor.wrapper) | ||
| $mask.addClass('uploading') if $img.hasClass('uploading') and @editor.uploader.html5 | ||
| $img.data('mask', $mask) | ||
| $mask.data('img', $img) | ||
|
|
||
| imgPosition = $img.position() | ||
| toolbarH = @editor.toolbar.wrapper.outerHeight() | ||
| $mask.css({ | ||
| top: imgPosition.top + toolbarH, | ||
| left: imgPosition.left, | ||
| width: $img.width(), | ||
| height: $img.height() | ||
| }) | ||
|
|
||
| img = new Image() | ||
|
|
||
| img.onload = => | ||
|
|
@@ -263,7 +255,12 @@ class ImageButton extends Button | |
| }) | ||
|
|
||
| if $img.hasClass 'uploading' # img being uploaded | ||
| @editor.body[0].offsetHeight # force reflow | ||
| imgPosition = $img.position() | ||
| toolbarH = @editor.toolbar.wrapper.outerHeight() | ||
| $mask.css({ | ||
| top: imgPosition.top + toolbarH, | ||
| left: imgPosition.left, | ||
| width: $img.width(), | ||
| height: $img.height() | ||
| }) | ||
|
|
@@ -289,6 +286,10 @@ class ImageButton extends Button | |
| if $block.is('p') and [email protected] $block | ||
| $block = $('<p/>').append(@editor.util.phBr).insertAfter($block) | ||
| @editor.selection.setRangeAtStartOf $block, range | ||
| #else if $block.is('li') | ||
| #$block = @editor.util.furthestNode $block, 'ul, ol' | ||
| #$block = $('<p/>').append(@editor.util.phBr).insertAfter($block) | ||
| #@editor.selection.setRangeAtStartOf $block, range | ||
|
|
||
| $img = $('<img/>').attr('alt', name) | ||
| range.insertNode $img[0] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2932,7 +2932,7 @@ class ImageButton extends Button | |
| return unless $img.hasClass('uploading') | ||
| src = if img then img.src else @defaultImage | ||
|
|
||
| @loadImage $img, src, () => | ||
| @loadImage $img, src, => | ||
| @popover.refresh() | ||
| @popover.srcEl.val('正在上传...') | ||
| .prop('disabled', true) | ||
|
|
@@ -3022,20 +3022,12 @@ class ImageButton extends Button | |
| $mask = $img.data('mask') | ||
| if !$mask | ||
| $mask = $('<div class="simditor-image-loading"><span></span></div>') | ||
| .hide() | ||
| .appendTo(@editor.wrapper) | ||
| $mask.addClass('uploading') if $img.hasClass('uploading') and @editor.uploader.html5 | ||
| $img.data('mask', $mask) | ||
| $mask.data('img', $img) | ||
|
|
||
| imgPosition = $img.position() | ||
| toolbarH = @editor.toolbar.wrapper.outerHeight() | ||
| $mask.css({ | ||
| top: imgPosition.top + toolbarH, | ||
| left: imgPosition.left, | ||
| width: $img.width(), | ||
| height: $img.height() | ||
| }) | ||
|
|
||
| img = new Image() | ||
|
|
||
| img.onload = => | ||
|
|
@@ -3056,7 +3048,12 @@ class ImageButton extends Button | |
| }) | ||
|
|
||
| if $img.hasClass 'uploading' # img being uploaded | ||
| @editor.body[0].offsetHeight # force reflow | ||
| imgPosition = $img.position() | ||
| toolbarH = @editor.toolbar.wrapper.outerHeight() | ||
| $mask.css({ | ||
| top: imgPosition.top + toolbarH, | ||
| left: imgPosition.left, | ||
| width: $img.width(), | ||
| height: $img.height() | ||
| }) | ||
|
|
@@ -3082,6 +3079,10 @@ class ImageButton extends Button | |
| if $block.is('p') and [email protected] $block | ||
| $block = $('<p/>').append(@editor.util.phBr).insertAfter($block) | ||
| @editor.selection.setRangeAtStartOf $block, range | ||
| #else if $block.is('li') | ||
| #$block = @editor.util.furthestNode $block, 'ul, ol' | ||
| #$block = $('<p/>').append(@editor.util.phBr).insertAfter($block) | ||
| #@editor.selection.setRangeAtStartOf $block, range | ||
|
|
||
| $img = $('<img/>').attr('alt', name) | ||
| range.insertNode $img[0] | ||
|
|
||