Merge pull request #105 from open-craft/haikuginger/fix-background-bu…

…tton [SOL-2077] Prevent 'Change Background' button from forcing form submission
openedx · Sep 23, 2016 · 45b0e1a · 45b0e1a
2 parents 85c6143 + 8441f33
commit 45b0e1a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ install:
     - "sh install_test_deps.sh"
     - "pip uninstall -y xblock-drag-and-drop-v2"
     - "python setup.py sdist"
-    - "pip install dist/xblock-drag-and-drop-v2-2.0.9.tar.gz"
+    - "pip install dist/xblock-drag-and-drop-v2-2.0.10.tar.gz"
 script:
     - pep8 drag_and_drop_v2 tests --max-line-length=120
     - pylint drag_and_drop_v2

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,11 @@
+Version 2.0.10 (2016-09-22)
+---------------------------
+
+* ([#97](https://github.com/edx-solutions/xblock-drag-and-drop-v2/pull/97)) Added "item" field to item.dropped event
+* ([#101](https://github.com/edx-solutions/xblock-drag-and-drop-v2/pull/101)) Implement "show answer" button
+* ([#103](https://github.com/edx-solutions/xblock-drag-and-drop-v2/pull/103)) Miscellaneous UI fixes
+* ([#105](https://github.com/edx-solutions/xblock-drag-and-drop-v2/pull/105)) Correct an issue with background image selection
+
 Version 2.0.9 (2016-09-01)
 --------------------------
 

diff --git a/drag_and_drop_v2/templates/html/drag_and_drop_edit.html b/drag_and_drop_v2/templates/html/drag_and_drop_edit.html
@@ -94,7 +94,7 @@ <h3>{% trans "Zones" %}</h3>
                            type="text"
                            aria-describedby="background-url-{{id_suffix}}" />
                     </label>
-                    <button class="btn">{% trans "Change background" %}</button>
+                    <button type="button" class="btn">{% trans "Change background" %}</button>
                     <div id="background-url-description-{{id_suffix}}" class="form-help">
                         {% trans "For example, 'http://example.com/background.png' or '/static/background.png'." %}
                     </div>

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@ def package_data(pkg, root_list):
 
 setup(
     name='xblock-drag-and-drop-v2',
-    version='2.0.9',
+    version='2.0.10',
     description='XBlock - Drag-and-Drop v2',
     packages=['drag_and_drop_v2'],
     install_requires=[