Changeset 940411

Timestamp:

06/29/2014 04:03:11 PM (12 years ago)

Author:

der_maddis

Message:

moved post linking to startsection

Location:

wp-travelermap/trunk

Files:

• admin/js/travelermap-admin.js (modified) (4 diffs)
• admin/travelermap-admin.php (modified) (1 diff)
• admin/travelermap-upgrade.php (modified) (3 diffs)
• frontend/js/travelermap-frontend.js (modified) (6 diffs)
• frontend/travelermap-frontend.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wp-travelermap.php (modified) (2 diffs)

wp-travelermap/trunk/admin/js/travelermap-admin.js

@@ -169 +169 @@
                 $('#tm_place_at_address').prop('disabled', false);
                 $('#tm_save_changes').prop('disabled', false);
-            } else if (data.type === 'startsection') {
+            } else if (data.type === 'endsection') {
                 $('#tm_type').prop('disabled', false);
                 $('#tm_title').prop('disabled', false);
@@ -179 +179 @@
                 $('#tm_place_at_address').prop('disabled', false);
                 $('#tm_save_changes').prop('disabled', false);
-            } else if (data.type === 'endsection' || data.type === 'startendsection') {
+            } else if (data.type === 'startsection' || data.type === 'startendsection') {
                 $('#tm_type').prop('disabled', false);
                 $('#tm_title').prop('disabled', false);
@@ -311 +311 @@
         function _tm_generateMap() {
             var obj = {};
-            obj['version'] = "1.1.0";
+            obj['version'] = "1.3.0";
             obj['mapid'] = $('#tm_map').data('mapid');
             obj['name'] = $('#tm_map_name').val();
@@ -406 +406 @@
                                         return;
                                     }
-                                    if ($('#tm_type').val() !== 'endsection') {
+                                    if ($('#tm_type').val() !== 'startsection' && $('#tm_type').val() !== 'startendsection') {
                                         $('#tm_type').val('post');
                                     }

wp-travelermap/trunk/admin/travelermap-admin.php

@@ -45 +45 @@
     wp_enqueue_script('spectrum', TM_URL . "js/spectrum.js" , array('jquery'), '1.3.4', false);
     wp_enqueue_script('json2');
-    wp_enqueue_script('travelermap-admin', TM_URL . "admin/js/travelermap-admin.js" , array('jquery', 'jquery-ui-core', 'jquery-ui-widget'), '1.2.0', false);
-    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.2.0', false);
+    wp_enqueue_script('travelermap-admin', TM_URL . "admin/js/travelermap-admin.js" , array('jquery', 'jquery-ui-core', 'jquery-ui-widget'), '1.3.0', false);
+    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.3.0', false);
     wp_enqueue_style('tm-admin', TM_URL . "media/tm-admin.css" );
     wp_enqueue_style('tm-frontend', TM_URL . "media/tm-frontend.css" );

wp-travelermap/trunk/admin/travelermap-upgrade.php

@@ -30 +30 @@
         travelermap_upgrade_1_0_0_to_1_1_0();
     }
+    $currentVersion = get_option("travelermap_version");
     if( version_compare($currentVersion, '1.2.0', '<')) {
         travelermap_upgrade_1_1_0_to_1_2_0();
+    }
+    $currentVersion = get_option("travelermap_version");
+    if( version_compare($currentVersion, '1.3.0', '<')) {
+        travelermap_upgrade_1_2_0_to_1_3_0();
     }
 }
 
 function travelermap_upgrade_1_0_0_to_1_1_0() {
-    $settings = get_option('traverlermap_settings');
+    $settings = get_option('travelermap_settings');
     
     if (!$settings) {
@@ -50 +55 @@
 
 function travelermap_upgrade_1_1_0_to_1_2_0() {
-    $settings = get_option('traverlermap_settings');
+    $settings = get_option('travelermap_settings');
     
     if (!$settings) {
@@ -63 +68 @@
 }
 
+function travelermap_upgrade_1_2_0_to_1_3_0() {
+    $settings = get_option('travelermap_settings');
+    
+    if (!$settings) {
+        $settings = array(
+        );
+        update_option('travelermap_settings', $settings);
+    }
+
+    update_option("travelermap_version", '1.3.0');
+    update_option("travelermap_db_version", '1.3.0');
+
+}
+
 travelermap_upgrade();
 

wp-travelermap/trunk/frontend/js/travelermap-frontend.js

@@ -214 +214 @@
                             evt.target.setStyle({opacity: 0.5});
                         });
+                        currentLine.bindPopup(feature.title);
+                        currentLine['tm_data'] = feature;
+                        feature['_lf_object'] = currentLine;
                         currentLine.addLatLng([feature.lat, feature.lng]);
                         isInSection = true;
@@ -225 +228 @@
                         //var nextPoint = findNextWaypointMarker(data,i);
                         currentLine.addLatLng([feature.lat, feature.lng]);
-                        currentLine.bindPopup(feature.title);
-                        currentLine['tm_data'] = feature;
-                        feature['_lf_object'] = currentLine;
                         group.addLayer(currentLine);
                         currentLine = L.geodesicPolyline([],{color:lineColor});
@@ -240 +240 @@
                     } else if(feature.type === 'startendsection') {
                         currentLine.addLatLng([feature.lat, feature.lng]);
-                        currentLine.bindPopup(feature.title);
-                        currentLine['tm_data'] = feature;
                         group.addLayer(currentLine);
-                        feature['_lf_object'] = currentLine;
                         currentLine = L.geodesicPolyline([],{color:lineColor});
                         currentLine.on('mouseover', function(evt) {
@@ -257 +254 @@
                             evt.target.setStyle({opacity: 0.5});
                         });
+                        currentLine.bindPopup(feature.title);
+                        currentLine['tm_data'] = feature;
+                        feature['_lf_object'] = currentLine;
                         currentLine.addLatLng([feature.lat, feature.lng]); //add as starting point
                         var nextPoint = _findNextWaypointMarker(data,i+1);
@@ -353 +353 @@
                 }
                 var dateInfo = '<span>';
-                if(feature.type === 'endsection' || feature.type === 'startendsection') {
-                    var start = _findStartSection(data, position-1);
-                    if(start && start.departure) {
-                        dateInfo += "Start: " + $.format.date(start.departure, _mapOptions.dateFormat) + ' | ';
-                    } else if(start && start.arrival) {
-                        dateInfo += "Start: " + $.format.date(start.arrival, _mapOptions.dateFormat) + ' | ';
-                    }
-                    if(feature.arrival) {
-                        dateInfo += "End: " + $.format.date(feature.arrival, _mapOptions.dateFormat) + ' | ';
-                    } else if(feature.departure) {
-                        dateInfo += "End: " + $.format.date(feature.departure, _mapOptions.dateFormat) + ' | ';
+                if(feature.type === 'startsection' || feature.type === 'startendsection') {
+                    var end = _findEndSection(data, position+1);
+                    if(feature.departure) {
+                        dateInfo += "Start: " + $.format.date(feature.departure, _mapOptions.dateFormat) + ' | ';
+                    } else if(feature.arrival) {
+                        dateInfo += "Start: " + $.format.date(feature.arrival, _mapOptions.dateFormat) + ' | ';
+                    }
+                    if(end && end.arrival) {
+                        dateInfo += "End: " + $.format.date(end.arrival, _mapOptions.dateFormat) + ' | ';
+                    } else if(end && end.departure) {
+                        dateInfo += "End: " + $.format.date(end.departure, _mapOptions.dateFormat) + ' | ';
                     }
                 } else {
@@ -391 +391 @@
                     for(var j = 0; j < data[i].data.length; j++) {
                         var feature = data[i].data[j];
-                        if(feature.type === 'startsection' || feature.type === 'waypoint') continue;
+                        if(feature.type === 'endsection' || feature.type === 'waypoint') continue;
                         var markerInfo = _createMarkerInfo(feature, data[i].data, j);
                         _markerInfoMapping[data[i].name].push({marker: feature._lf_object, info: markerInfo});

wp-travelermap/trunk/frontend/travelermap-frontend.php

@@ -87 +87 @@
     wp_enqueue_script('jquery-dateFormat', TM_URL . "js/jquery-dateFormat.min.js" , array('jquery'), '1.0.0', false);
     wp_enqueue_script('json2');
-    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.2.0', false);
+    wp_enqueue_script('travelermap-frontend', TM_URL . "frontend/js/travelermap-frontend.js" , array('jquery'), '1.3.0', false);
 }
 

wp-travelermap/trunk/readme.txt

@@ -1 +1 @@
 === wp-travelermap ===
-Contributors: Mathis Zeiher
+Contributors: der_maddis
 Donate link: http://bitschubser.org
 Tags: travel, map, waypoints
 Requires at least: 3.9.0
 Tested up to: 3.9.1
-Stable tag: 1.2.0
+Stable tag: 1.3.0
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -51 +51 @@
 
 == Changelog ==
+
+= 1.3.0 =
+* Moved Post linking from endsection to startsection
 
 = 1.2.0 =

wp-travelermap/trunk/wp-travelermap.php

@@ -4 +4 @@
 Plugin URI: http://bitschubser.org/projects/wp-travelermap
 Description: A simple Plugin to create travel routes and manage maps
-Version: 1.2.0
+Version: 1.3.0
 Author: Mathis Zeiher
 Author URI: http://bitschubser.org/
@@ -32 +32 @@
 
 if ( ! defined( 'TM_VERSION' ) )    
-    define( 'TM_VERSION', '1.2.0' );
+    define( 'TM_VERSION', '1.3.0' );
     
 if ( ! defined( 'TM_URL' ) )