Image selection

CHANGELOG.md

@@ -20,9 +20,9 @@ WYMeditor.
   that is considered unhelpful.
   It was previously disabled for a while and it was found to be enabled now.
   So it is now disabled again.
-* [#648](https://github.com/wymeditor/wymeditor/pull/647)
-  Similar to the above table editing feature, this feature allows resizing
-  images and other objects. Similarly, now disabled.
+* [#648](https://github.com/wymeditor/wymeditor/pull/647),
+  [#641](https://github.com/wymeditor/wymeditor/pull/641)
+  Object resizing (images, primarily) in Firefox and IE has been disabled.
 
 ### Enhancements
 
@@ -32,6 +32,8 @@ WYMeditor.
   New `editor.doesElementContainSelection` method.
 * [#512](https://github.com/wymeditor/wymeditor/pull/512)
   New undo/redo methods in the API.
+* [#641](https://github.com/wymeditor/wymeditor/pull/641)
+  New `editor.getSelectedImage()`
 
 ### Bug Fixes
 

docs/writing_plugins/api.rst

@@ -246,6 +246,12 @@ Example: get the selected root container.
 
     wym.status(wym.mainContainer().tagName);
 
+``getSelectedImage()``
+======================
+
+If selection encompasses exactly a single image, returns that image.
+Otherwise returns ``false``.
+
 ``canSetCaretBefore(node)``
 ===========================
 

src/test/unit/manipulation-test-helper.js

@@ -64,6 +64,33 @@
  *         ```
  *         This example uses the `jquery.browser` plugin
  *         https://github.com/gabceb/jquery-browser-plugin
+ *     `async`
+ *         Optional; If this is `true` then after the manipulation is performed
+ *         assertions regarding the results are not synchronously executed.
+ *         Instead, a function is returned. Calling this function resumes these
+ *         assertions. This can only be used when a single manipulation cause
+ *         is provided (for example, only `manipulationFunc`).
+ *         For example:
+ *         ```
+ *         test("Test something asynchronous", function () {
+ *             var wymeditor = jQuery.wymeditors(0),
+ *                 somethingAsync,
+ *                 resumeManipulationTestHelper;
+ *
+ *             somethingAsync = wymeditor.somethingAsync;
+ *             wymeditor.somethingAsync = function () {
+ *                 somethingAsync.call(wymeditor);
+ *                 resumeManipulationTestHelper();
+ *             };
+ *
+ *             resumeManipulationTestHelper = manipulationTestHelper({
+ *                 startHtml: "</p>Foo</p>",
+ *                 async: true,
+ *                 manipulationClickSelector: ".asyncActionButton",
+ *                 expectedResultHtml: "</p>Bar</p>"
+ *             });
+ *         });
+ *         ```
  *
  *     `manipulationFunc` and `manipulationClickSelector` are not exclusive
  *     of each other. The procedure will be performed once for each of them.
@@ -72,7 +99,8 @@
 function manipulationTestHelper(a) {
     var executions = [],
         wymeditor,
-        EXECUTE;
+        EXECUTE,
+        asyncResumeFunc;
 
     if (skipThisTest() === true) {
         return;
@@ -100,29 +128,51 @@ function manipulationTestHelper(a) {
         manipulateAndAssert(EXECUTE.NO_MANIPULATION);
     }
 
+    if (
+        a.async === true &&
+        executions.length > 1
+    ) {
+        throw "The `async` option is only allowed with one manipulation cause";
+    }
+
     while (executions.length > 0) {
-        manipulateAndAssert(executions.pop());
+        asyncResumeFunc = manipulateAndAssert(executions.pop());
     }
 
+    return asyncResumeFunc;
+
     function manipulateAndAssert(manipulationCause) {
 
         initialize();
         assertStartHtml();
         resetHistory();
 
         performManipulation(manipulationCause);
-        assertResultHtml();
-        additionalAssertions();
-
-        if (a.testUndoRedo !== true) {
-            return;
+        // Expectancy incremented here in order to fail tests that specify
+        // `async` but do not call the `asyncResumeFunc`.
+        expect(expect() + 1);
+        if (a.async === true) {
+            return assertResultUndoAndAdditional;
+        } else {
+            assertResultUndoAndAdditional();
         }
-        wymeditor.undoRedo.undo();
-        assertStartHtml("Back to start HTML after undo");
 
-        wymeditor.undoRedo.redo();
-        assertResultHtml("Back to result HTML after redo");
-        additionalAssertions();
+        function assertResultUndoAndAdditional() {
+            // Return expectancy to real value.
+            expect(expect() - 1);
+            assertResultHtml();
+            additionalAssertions();
+
+            if (a.testUndoRedo !== true) {
+                return;
+            }
+            wymeditor.undoRedo.undo();
+            assertStartHtml("Back to start HTML after undo");
+
+            wymeditor.undoRedo.redo();
+            assertResultHtml("Back to result HTML after redo");
+            additionalAssertions();
+        }
 
         function initialize() {
             if (typeof a.startHtml === 'string') {

src/test/unit/specific_feature_tests/class_toggling.js

@@ -2,6 +2,8 @@
     prepareUnitTestModule,
     test,
     manipulationTestHelper,
+    inPhantomjs,
+    SKIP_THIS_TEST,
     IMG_SRC
 */
 "use strict";
@@ -154,7 +156,8 @@ test("Adds className to image", function () {
             , "</p>"
         ].join(""),
         prepareFunc: function (wymeditor) {
-            wymeditor.$body().find("img").mousedown();
+            var img = wymeditor.$body().find("img")[0];
+            wymeditor._selectSingleNode(img);
         },
         manipulationFunc: function (wymeditor) {
             wymeditor.toggleClass("fancy", "img");
@@ -165,6 +168,9 @@ test("Adds className to image", function () {
                 , "Foo"
                 , "<img alt=\"foo\" class=\"fancy\" src=\"" + IMG_SRC + "\" />"
             , "</p>"
-        ].join("")
+        ].join(""),
+        skipFunc: function () {
+            return inPhantomjs ? SKIP_THIS_TEST : null;
+        }
     });
 });