Mark version 5.25.2

Author: marijnh

AUTHORS

@@ -6,6 +6,7 @@ Abdelouahab
 Abe Fettig
 Adam Ahmed
 Adam King
+Adam Particka
 adanlobato
 Adán Lobato
 Adrian Aichner
@@ -200,6 +201,7 @@ ficristo
 Filip Noetzel
 Filip Stollár
 flack
+Florian Felten
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
@@ -265,6 +267,7 @@ James Campos
 James Howard
 James Thorne
 Jamie Hill
+Jamie Morris
 Jan Jongboom
 jankeromnes
 Jan Keromnes
@@ -417,6 +420,7 @@ Max Schaefer
 Max Xiantu
 mbarkhau
 McBrainy
+mce2
 melpon
 Metatheos
 Micah Dubinko
@@ -473,6 +477,7 @@ Oreoluwa Onatemowo
 Oskar Segersvärd
 pablo
 pabloferz
+Pablo Zubieta
 Page
 Panupong Pasupat
 paris
@@ -513,6 +518,7 @@ Rasmus Erik Voel Jensen
 ray ratchup
 Ray Ratchup
 Remi Nyborg
+Renaud Durlin
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
@@ -538,6 +544,7 @@ Sascha Peilicke
 satamas
 satchmorun
 sathyamoorthi
+Saul Costa
 S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
@@ -635,5 +642,6 @@ Zac Anger
 Zachary Dremann
 Zeno Rocha
 Zhang Hao
+Ziv
 zziuni
 魏鹏刚

CHANGELOG.md

@@ -1,4 +1,24 @@
-## 5.25.0 (2017-02-22)
+## 5.25.2 (2017-04-20)
+
+### Bug fixes
+
+Better handling of selections that cover the whole viewport in contentEditable-mode.
+
+No longer accidentally scroll the editor into view when calling `setValue`.
+
+Work around Chrome Android bug when converting screen coordinates to editor positions.
+
+Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.
+
+Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+
+[shell mode](http://codemirror.net/mode/shell/): Handle nested braces.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+
+## 5.25.0 (2017-03-20)
 
 ### Bug fixes
 

doc/manual.html

@@ -69,7 +69,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.2</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in

doc/releases.html

@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2017: <a href="http://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Better handling of selections that cover the whole viewport in contentEditable-mode.</li>
+    <li>No longer accidentally scroll the editor into view when calling <code>setValue</code>.</li>
+    <li>Work around Chrome Android bug when converting screen coordinates to editor positions.</li>
+    <li>Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.</li>
+    <li>Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Handle nested braces.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
+  </ul>
+
   <p class="rel">20-03-2017: <a href="http://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
 
   <ul class=rel-note>

index.html

@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.25.1",
+  "version": "5.25.2",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",

src/edit/main.js

@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.25.1"
+CodeMirror.version = "5.25.2"