Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mms] Fix handling image attachments when added via the HTML editor I…
…mage dialog.
- Loading branch information
Showing
6 changed files
with
104 additions
and
42 deletions.
There are no files selected for viewing
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
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 |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /** | ||
| * Utility object used to poll for deletion of image (attachment) data. | ||
| * | ||
| * CKEditor 3 doesn't support onchange event for content body. | ||
| * Instead, poll the attached images to detect deletions, since this may | ||
| * influence attachment limits. | ||
| * | ||
| * @author Michael Slusarz <slusarz@horde.org> | ||
| * @copyright 2014 Horde LLC | ||
| * @license GPL-2 (http://www.horde.org/licenses/gpl) | ||
| */ | ||
|
|
||
| var IMP_Ckeditor_Imagepoll = {}; | ||
| // 'related_attr' property set in IMP_Script_Package_ComposeBase | ||
|
|
||
| (function (ob) { | ||
|
|
||
| var active = []; | ||
|
|
||
| ob.add = function(elt) | ||
| { | ||
| if (!active.size()) { | ||
| new PeriodicalExecuter(function(pe) { | ||
| var del = []; | ||
|
|
||
| active.each(function(a) { | ||
| if (!a.parentNode) { | ||
| del.push(a); | ||
| } | ||
| }); | ||
|
|
||
| if (del.size()) { | ||
| ob.remove(del); | ||
|
|
||
| // Array.without() doesn't support array input. | ||
| active = active.findAll(function(v) { | ||
| return !del.include(v); | ||
| }); | ||
|
|
||
| if (!active.size()) { | ||
| pe.stop(); | ||
| } | ||
| } | ||
| }, 2); | ||
| } | ||
|
|
||
| active.push(elt); | ||
| }; | ||
|
|
||
| ob.remove = function(elts) | ||
| { | ||
| var ids = []; | ||
|
|
||
| elts.invoke('getAttribute', ob.related_attr).compact().each(function(r) { | ||
| var s = r.split(';', 2); | ||
| ids.push(s[1]); | ||
| }); | ||
|
|
||
| if (ids.size()) { | ||
| DimpCore.doAction( | ||
| 'deleteAttach', | ||
| DimpCompose.actionParams({ | ||
| atc_indices: Object.toJSON(ids), | ||
| quiet: 1 | ||
| }) | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| }(IMP_Ckeditor_Imagepoll)); |
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
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
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
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