Fixes WAVE-269 Gadgets are now inserted in the position of the cursor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/0f168037 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/0f168037 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/0f168037 Branch: refs/heads/wave-0.4-rc6 Commit: 0f16803731322f788621715c2bbe8089cff7e6a2 Parents: 9161196 Author: Antonio Tenorio-Fornés <[email protected]> Authored: Mon Aug 25 20:30:06 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Mon Aug 25 20:30:06 2014 +0300 ---------------------------------------------------------------------- .../wave/client/wavepanel/impl/toolbar/EditToolbar.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/0f168037/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java index 7abe368..c49cc07 100644 --- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java +++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java @@ -337,12 +337,13 @@ public class EditToolbar { .setIcon(css.insertGadget()) .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { @Override public void onClicked() { + final FocusedRange focusedRange = editor.getSelectionHelper().getSelectionRange(); GadgetSelectorWidget selector = new GadgetSelectorWidget(new GadgetInfoProviderImpl(new GwtGadgetInfoParser())); selector.addFeaturedOptions(); final UniversalPopup popup = selector.showInPopup(); selector.setListener(new GadgetSelectorWidget.Listener() { @Override public void onSelect(String url) { - insertGadget(url); + insertGadget(url, focusedRange); popup.hide(); } }); @@ -350,9 +351,8 @@ public class EditToolbar { }); } - private void insertGadget(String url) { + private void insertGadget(String url, FocusedRange focusedRange) { int from = -1; - FocusedRange focusedRange = editor.getSelectionHelper().getSelectionRange(); if (focusedRange != null) { from = focusedRange.getFocus(); }
