Skip to content
This repository has been archived by the owner on Apr 2, 2021. It is now read-only.

Image selection #641

Merged
merged 46 commits into from Dec 30, 2014
Merged

Image selection #641

merged 46 commits into from Dec 30, 2014

Commits on Dec 16, 2014

  1. Select images on mousedown using Rangy 

    Removes _selectedImage.
    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    e34c686 View commit details
    Browse the repository at this point in the history

  2. Add test for unlinking image.

    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    7780bdc View commit details
    Browse the repository at this point in the history

  3. TridentPre7's _keyup: remove unused assignment

    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    2da645b View commit details
    Browse the repository at this point in the history

  4. Image selection test.

    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    c523284 View commit details
    Browse the repository at this point in the history

  5. Image selection test: assert only one node selected

    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    0dcea99 View commit details
    Browse the repository at this point in the history

  6. Use manipulationFunc in image selection test

    @mightyiam
    mightyiam committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    4a47c58 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2014

  1. Merge branch 'classToggling' into selectImagesWithRangy 

    Conflicts:
	src/test/unit/specific_feature_tests/images.js
	src/wymeditor/editor/base.js
    @mightyiam
    mightyiam committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    75ce430 View commit details
    Browse the repository at this point in the history

  2. Make JSHint happy.

    @mightyiam
    mightyiam committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    5f6e1fb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into selectImagesWithRangy 

    Conflicts:
	src/wymeditor/editor/base.js
    @mightyiam
    mightyiam committed Dec 17, 2014
    Configuration menu
    Copy the full SHA
    1e7dcd8 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2014

  1. editor.getSelectedImage including api doc and tests

    @mightyiam
    mightyiam committed Dec 18, 2014
    Configuration menu
    Copy the full SHA
    bf090a9 View commit details
    Browse the repository at this point in the history

  2. Fix toggleClass

    @mightyiam
    mightyiam committed Dec 18, 2014
    Configuration menu
    Copy the full SHA
    8b918a2 View commit details
    Browse the repository at this point in the history

  3. Use IMG_SRC in a few places in tests

    @mightyiam
    mightyiam committed Dec 18, 2014
    Configuration menu
    Copy the full SHA
    5458c49 View commit details
    Browse the repository at this point in the history

  4. _selectSingleNode

    @mightyiam
    mightyiam committed Dec 18, 2014
    Configuration menu
    Copy the full SHA
    580db7b View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2014

  1. Merge branch 'image-dialog-focus-before-insert' into selectImagesWith… 

    …Rangy
    @mightyiam
    mightyiam committed Dec 19, 2014
    Configuration menu
    Copy the full SHA
    92a1af5 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2014

  1. Merge branch 'qunit-hide-passed' into selectImagesWithRangy

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    eab4b0e View commit details
    Browse the repository at this point in the history

  2. _selectSingleNode: return statement is supposed to be throw

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    cf02d83 View commit details
    Browse the repository at this point in the history

  3. Fix image dragging and dropping

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    9a5525f View commit details
    Browse the repository at this point in the history

  4. Docstring for _selectSingleNode

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    545c3fb View commit details
    Browse the repository at this point in the history

  5. Tests with image selection: skip in PhantomJS

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    d9a4160 View commit details
    Browse the repository at this point in the history

  6. Make JSHint happy

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    97d1753 View commit details
    Browse the repository at this point in the history

  7. Some code comments for #641

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    d7e9f1b View commit details
    Browse the repository at this point in the history

  8. Fix code comments for #641

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    bb09bdb View commit details
    Browse the repository at this point in the history

  9. Changelog for #641.

    @mightyiam
    mightyiam committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    b936084 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2014

  1. Fix Trident 7's docEventQuirks

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    d581582 View commit details
    Browse the repository at this point in the history

  2. Fix some image related tests

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    73a9760 View commit details
    Browse the repository at this point in the history

  3. Remove old image selection test

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    149f898 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into selectImagesWithRangy

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    4388986 View commit details
    Browse the repository at this point in the history

  5. Don't use sinon fake timers in QUnit.

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    1f56d9c View commit details
    Browse the repository at this point in the history

  6. manipulationTestHelper: async feature

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    be5fcfd View commit details
    Browse the repository at this point in the history

  7. Async image selection test for pre-7 Trident

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    b7d405b View commit details
    Browse the repository at this point in the history

  8. Fix some image related tests for pre-7 Trident

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    82715fe View commit details
    Browse the repository at this point in the history

  9. Pre-7 trident's image selection test: some comments

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    686aac6 View commit details
    Browse the repository at this point in the history

  10. Fix some code comment

    @mightyiam
    mightyiam committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    37d06d4 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2014

  1. Test for image selection via dragend in IE

    @mightyiam
    mightyiam committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    ec95b71 View commit details
    Browse the repository at this point in the history

  2. Deselect before image selection tests.

    @mightyiam
    mightyiam committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    0560db2 View commit details
    Browse the repository at this point in the history

  3. Fix an image selection test had extra async: true

    @mightyiam
    mightyiam committed Dec 23, 2014
    Configuration menu
    Copy the full SHA
    6e4b123 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2014

  1. Added missing async: true to test helper example

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    306fad5 View commit details
    Browse the repository at this point in the history

  2. manipulationTestHelper: more readable async example

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    cb38bce View commit details
    Browse the repository at this point in the history

  3. manipulationTestHelper: semantic change in returning asyncResumeFunc

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    99cbd40 View commit details
    Browse the repository at this point in the history

  4. manipulationTestHelper: fail tests that specify async but do not call

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    e1aed3a View commit details
    Browse the repository at this point in the history

  5. Image selection test: more readable.

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    6c88b05 View commit details
    Browse the repository at this point in the history

  6. Unit tests: explain why we do not use fake timers.

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    f25a80a View commit details
    Browse the repository at this point in the history

  7. Comment on pre-7 Triden'ts mouseup on an image.

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    c6d0553 View commit details
    Browse the repository at this point in the history

  8. Better comment for pre-7 Trident image selection

    @mightyiam
    mightyiam committed Dec 24, 2014
    Configuration menu
    Copy the full SHA
    3c1604f View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2014

  1. manipulationTestHelper: add comma in docstring

    @mightyiam
    mightyiam committed Dec 30, 2014
    Configuration menu
    Copy the full SHA
    f1921f8 View commit details
    Browse the repository at this point in the history

  2. manipulationTestHelper: return asyncResumeFunc only if async

    @mightyiam
    mightyiam committed Dec 30, 2014
    Configuration menu
    Copy the full SHA
    7d90d19 View commit details
    Browse the repository at this point in the history