Merge branch 'master' of github.com:2gis/mapsapi

2gis · Jun 17, 2016 · 645dbf1 · 645dbf1
2 parents 6ec4ea0 + b072fc1
commit 645dbf1
Show file tree

Hide file tree

Showing 91 changed files with 17,834 additions and 7,253 deletions.
diff --git a/gulp/util/gendoc.js b/gulp/util/gendoc.js
@@ -62,8 +62,8 @@ function generateDocumentation(config, rootPath, destPath) { // (Object, String,
     for (var i = 0, leng = mdData.length; i < leng; i++) {
         (function (i) {
             var mdFilePath = mdData[i].path,
-                htmlFileName = mdFilePath.match(/[^/]+(?=\.(md))/gi)[0] + '.html',
-                pluginDirName = mdFilePath.match(/^[\/]?([\w]+)/gi)[0],
+                htmlFileName = mdFilePath.match(/([\w_-]+)\.md$/i)[1] + '.html',
+                pluginDirName = mdFilePath.match(/\/?(.*)\/[.\w_-]+$/)[1],
                 renderer = new marked.Renderer(),
                 tocHtml = generateTableOfContents(marked.lexer(mdData[i].content.toString())),
                 headerRepeats = {},

diff --git a/src/DGEntrance/doc/DGEntrance.md b/src/DGEntrance/doc/DGEntrance.md
@@ -60,7 +60,7 @@
         <td><code><b>interactive</b></code></td>
         <td><code>Boolean</td>
         <td><code>false</code></td>
-        <td>Если значение false, тогда обработчик действий мышки не вызывается.</td>
+        <td>Если значение false, тогда обработчик действий мыши не вызывается.</td>
     </tr>
     <tr>
         <td><code><b>autoClose</b></code></td>

diff --git a/src/copyright.js b/src/copyright.js
@@ -1,5 +1,5 @@
 /*
  Maps api created at 2GIS. Build on Leaflet.
- (c) 2013-2015, 2GIS
+ (c) 2013-2016, 2GIS
 */
 
diff --git a/src/doc/en/examples/base.md b/src/doc/en/examples/base.md
@@ -0,0 +1,6 @@
+## Basic Usage Examples
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/base.md -->
diff --git a/src/doc/en/examples/bounds.md b/src/doc/en/examples/bounds.md
@@ -0,0 +1,6 @@
+## Working with Bounds
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/bounds.md -->
diff --git a/src/doc/en/examples/controls.md b/src/doc/en/examples/controls.md
@@ -0,0 +1,6 @@
+## Working with Controls
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/controls.md -->
diff --git a/src/doc/en/examples/events.md b/src/doc/en/examples/events.md
@@ -0,0 +1,6 @@
+## Working with Events
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/events.md -->
diff --git a/src/doc/en/examples/external-modules.md b/src/doc/en/examples/external-modules.md
@@ -0,0 +1,6 @@
+## External Modules
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/external-modules.md -->
diff --git a/src/doc/en/examples/geocoding.md b/src/doc/en/examples/geocoding.md
@@ -0,0 +1,6 @@
+## Working with Geo Coding API
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/geocoding.md -->
diff --git a/src/doc/en/examples/geojson.md b/src/doc/en/examples/geojson.md
@@ -0,0 +1,6 @@
+## Working with GeoJSON
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/geojson.md -->
diff --git a/src/doc/en/examples/markers.md b/src/doc/en/examples/markers.md
@@ -0,0 +1,6 @@
+## Working with Markers
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/markers.md -->
diff --git a/src/doc/en/examples/popups.md b/src/doc/en/examples/popups.md
@@ -0,0 +1,6 @@
+## Working with Popups
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/popups.md -->
diff --git a/src/doc/en/examples/vector-layers.md b/src/doc/en/examples/vector-layers.md
@@ -0,0 +1,6 @@
+## Working with Vector Layers
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/vector-layers.md -->
diff --git a/src/doc/en/examples/wkt.md b/src/doc/en/examples/wkt.md
@@ -0,0 +1,6 @@
+## Working with WKT
+
+{toc}
+
+<!-- TODO: translation -->
+<!-- translate whole file doc/ru/examples/wkt.md -->