Changeset 1846582

Timestamp:

03/25/2018 06:07:04 PM (8 years ago)

Author:

epointal

Message:

path colors and path ends

Location:

lf-hiker/trunk

Files:

• Model/Map.php (modified) (2 diffs)
• dist/helper-min.1.7.0.js (deleted)
• dist/helper-min.1.8.0.js (added)
• dist/helper.1.7.0.css (deleted)
• dist/helper.1.8.0.css (added)
• dist/lfh-front-min.1.7.0.js (deleted)
• dist/lfh-front-min.1.8.0.js (added)
• dist/lfh-post-editor-min.1.7.0.js (deleted)
• dist/lfh-post-editor-min.1.8.0.js (added)
• dist/lfh-post-editor.1.7.0.css (deleted)
• dist/lfh-post-editor.1.8.0.css (added)
• dist/lfh-style-min.1.7.0.css (deleted)
• dist/lfh-style-min.1.8.0.css (added)
• dist/tinymce-lfh-plugin-min.1.7.0.js (deleted)
• dist/tinymce-lfh-plugin-min.1.8.0.js (added)
• gulpfile.js (modified) (1 diff)
• images/markers/pointS6.png (added)
• js/lfh-plugin.js (modified) (2 diffs)
• lf-hiker.php (modified) (2 diffs)
• package.json (modified) (1 diff)
• readme.txt (modified) (3 diffs)

lf-hiker/trunk/Model/Map.php

@@ -17 +17 @@
         'home', 'wheelchair', 'school', 'child', 'female', 'male',   'bank', 'industry');
     
-    public static $colors_path = array('red', 'blue', 'purple', 'orange', 'darkred', 'darkblue', 'darkgreen');
+    public static $colors_path = array('red', 'blue', 'purple', 'orange', 'darkred', 'darkblue', 'darkgreen', 'black');
     
     public static $distance_units = array( 'km', 'miles');
@@ -344 +344 @@
     public static function is_path_color($var)
     {
-        if(in_array(strtolower($var), self::$colors_path)){
+        if(in_array(strtolower($var), self::$colors_path)
+                || preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $var)){
             return strtolower($var);
         }else{

lf-hiker/trunk/gulpfile.js

@@ -2 +2 @@
 //there are in files readme others version numbers: for releases, tested browsers, and the most important wordpress
 
-var old_version = '1.6.0';
-var version = '1.7.0';
+var old_version = '1.7.0';
+var version = '1.8.0';
 var gulp = require('gulp');
 var less = require('gulp-less');

lf-hiker/trunk/js/lfh-plugin.js

@@ -96 +96 @@
         popupAnchor:  [5, 5]
     });
-
+lfh.MINI_POINT_ICON = L.icon({
+    iconUrl: lfh.ICON_URL + '/markers/pointS6.png',
+    iconSize:     [6, 6], 
+    shadowSize:   [0, 0], 
+    iconAnchor:   [3, 3], 
+    shadowAnchor: [3, 3],  
+    popupAnchor:  [3, 3]
+});
 lfh.WIDTH_LIMIT = 620;
 
@@ -830 +837 @@
                     elem_id: track_id,
                     marker_options: {
-                        startIcon: lfh.POINT_ICON,
-                        endIcon: lfh.POINT_ICON,
+                        startIcon: _data.gpx[j].width> 2 ? lfh.POINT_ICON:lfh.MINI_POINT_ICON,
+                        endIcon: _data.gpx[j].width> 2 ? lfh.POINT_ICON:lfh.MINI_POINT_ICON,
                         //shadowUrl: 'images/pin-shadow.png'
                       }

lf-hiker/trunk/lf-hiker.php

@@ -6 +6 @@
     Author: epointal
     Author URI: http://elisabeth.pointal.org/
-    Version: 1.7.0
+    Version: 1.8.0
     License: GPL2
     Text domain: lfh
@@ -51 +51 @@
 class Lf_Hiker_Plugin
 {
-    const VERSION = '1.7.0';
+    const VERSION = '1.8.0';
     
     private static $_controller;

lf-hiker/trunk/package.json

@@ -1 +1 @@
 {
   "name": "lf-hiker",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "plugin for wordpress for display track with profil elevation",
   "main": "index.js",

lf-hiker/trunk/readme.txt

@@ -7 +7 @@
 Tested up to: 4.9  
 Stable tag: 1.0  
-Version: 1.7.0
+Version: 1.8.0
 License: GPLv2 or later  
 License URI: http://www.gnu.org/licenses/gpl-2.0.html  
@@ -97 +97 @@
  * Français (fr_FR) 
  * English (en_US) 
- * Deutsch (de_DE)  by [Kristof Kling](https://lg-buggingen.de/bugginger-feierabendlauf/strecke/)  
+ * Deutsch (de_DE) by [Kristof Kling](https://lg-buggingen.de/bugginger-feierabendlauf/strecke/)  
  
  If you need language of **Lf Hiker** which is not included. You can easily translate with poedit from the file :    
@@ -135 +135 @@
 
 == Changelog == 
+= 1.8.0 =
+ * Evolution: Add black in color path
+ * Evolution: Enable all hexadecimal color for path
+ * Evolution: Little dots at ends for path with width less than 3px
+ * Fixed: german translation
+ 
 = 1.7.0 =
  * Fixed: no path displayed with mesmerize theme