WordPress.org
Get WordPress

Plugin Directory

Changeset 1607007


Ignore:
Timestamp:
03/03/2017 07:38:03 AM (9 years ago)
Author:
ankurk91
Message:

trunk 2.5.0

Location:
ank-google-map/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • ank-google-map/trunk/ank-google-map.php

    r1600600 r1607007  
    66     * Plugin URI: https://github.com/ankurk91/wp-google-map
    77     * Description: Simple, light weight and non-bloated Google Map Plugin. Short code : <code>[ank_google_map]</code>
    8      * Version: 2.4.0
     8     * Version: 2.5.0
    99     * Author: Ankur Kumar
    1010     * Author URI: https://ankurk91.github.io/
    … …  
    1919if (!defined('ABSPATH')) die;
    2020
    21 define('AGM_PLUGIN_VERSION', '2.4.0');
     21define('AGM_PLUGIN_VERSION', '2.5.0');
    2222define('AGM_BASE_FILE', __FILE__);
    2323

  • ank-google-map/trunk/assets/frontend.js

    r1600600 r1607007  
    22    'use strict';
    33
     4    // Grab options from dumped JS on html
    45    var opt = window._agmOpt;
     6    // Expose some vars to a global namespace
     7    var AGM = window.AGM = {};
    58
    69    function loadGoogleMap() {
    … …  
    912
    1013        var mapOptions = {
    11                 zoomControl: !opt.controls.zoomControl,
    12                 zoomControlOptions: {
    13                     position: google.maps.ControlPosition.RIGHT_CENTER
    14                 },
    15                 mapTypeControl: !opt.controls.mapTypeControl,
    16                 streetViewControl: !opt.controls.streetViewControl,
    17                 scrollwheel: !opt.mobile.scrollwheel,
    18                 draggable: (width > 480) || !isTouchDevice(),
    19                 center: mapCenter,
    20                 zoom: parseInt(opt.map.zoom),
    21                 mapTypeId: google.maps.MapTypeId[opt.map.type],
    22                 mapTypeControlOptions: {
    23                     style: google.maps.MapTypeControlStyle.DROPDOWN_MENU,
    24                     position: google.maps.ControlPosition.TOP_LEFT
    25                 },
    26                 styles: opt.map.styles,
    27                 fullscreenControl: !opt.controls.fullscreenControl,
    28                 fullscreenControlOptions: {
    29                     position: google.maps.ControlPosition.RIGHT_TOP
    30                 },
    31                 gestureHandling: opt.mobile.gestureHandling || 'auto',
    32             }
    33             ;
     14            zoomControl: !opt.controls.zoomControl,
     15            zoomControlOptions: {
     16                position: google.maps.ControlPosition.RIGHT_CENTER
     17            },
     18            mapTypeControl: !opt.controls.mapTypeControl,
     19            streetViewControl: !opt.controls.streetViewControl,
     20            scrollwheel: !opt.mobile.scrollwheel,
     21            draggable: (width > 480) || !isTouchDevice(),
     22            center: mapCenter,
     23            zoom: parseInt(opt.map.zoom),
     24            mapTypeId: google.maps.MapTypeId[opt.map.type],
     25            mapTypeControlOptions: {
     26                style: google.maps.MapTypeControlStyle.DROPDOWN_MENU,
     27                position: google.maps.ControlPosition.TOP_LEFT
     28            },
     29            styles: opt.map.styles,
     30            fullscreenControl: !opt.controls.fullscreenControl,
     31            fullscreenControlOptions: {
     32                position: google.maps.ControlPosition.RIGHT_TOP
     33            },
     34            gestureHandling: opt.mobile.gestureHandling || 'auto',
     35        };
    3436        var map = new google.maps.Map(mapCanvas, mapOptions);
    3537
    … …  
    98100            }, 300);
    99101        });
     102
     103        // Lets expose them
     104        AGM.map = map;
     105        AGM.marker = marker;
     106        AGM.infoWindow = infoWindow;
     107        window.dispatchEvent(new Event('agm.loaded'));
    100108    }
    101109

  • ank-google-map/trunk/assets/frontend.min.js

    r1600600 r1607007  
    1 !function(o,e){"use strict";function n(){var n=Math.max(e.documentElement.clientWidth,o.innerWidth||0),i=new google.maps.LatLng(parseFloat(a.map.lat),parseFloat(a.map.lng)),r={zoomControl:!a.controls.zoomControl,zoomControlOptions:{position:google.maps.ControlPosition.RIGHT_CENTER},mapTypeControl:!a.controls.mapTypeControl,streetViewControl:!a.controls.streetViewControl,scrollwheel:!a.mobile.scrollwheel,draggable:n>480||!t(),center:i,zoom:parseInt(a.map.zoom),mapTypeId:google.maps.MapTypeId[a.map.type],mapTypeControlOptions:{style:google.maps.MapTypeControlStyle.DROPDOWN_MENU,position:google.maps.ControlPosition.TOP_LEFT},styles:a.map.styles,fullscreenControl:!a.controls.fullscreenControl,fullscreenControlOptions:{position:google.maps.ControlPosition.RIGHT_TOP},gestureHandling:a.mobile.gestureHandling||"auto"},s=new google.maps.Map(l,r);if(1===a.marker.enabled){var m=new google.maps.Marker({position:i,map:s,optimized:!1,title:a.marker.title,icon:a.marker.file||a.marker.color||""});if("NONE"!==a.marker.animation&&m.setAnimation(google.maps.Animation[a.marker.animation]),1===a.info_window.enabled){var p=new google.maps.InfoWindow({content:a.info_window.text});google.maps.event.addListener(s,"click",function(){p.close()})}}1===a.marker.enabled&&1===a.info_window.enabled&&(google.maps.event.addListener(m,"click",function(){p.open(s,m),m.setAnimation(null)}),1===a.info_window.state&&o.setTimeout(function(){p.open(s,m),m.setAnimation(null)},2e3));var g;google.maps.event.addDomListener(o,"resize",function(){g&&clearTimeout(g),g=o.setTimeout(function(){s.setCenter(i)},300)})}function t(){return"ontouchstart"in o||navigator.maxTouchPoints}var a=o._agmOpt,l=e.getElementById("agm-canvas");"undefined"!=typeof l&&l&&("object"==typeof google&&google.maps?google.maps.event.addDomListener(o,"load",n):(l.innerHTML='<p class="map-not-loaded" style="text-align: center">Failed to load Google Map.<br>Please try again.</p>',l.style.height="auto"))}(window,document);
     1!function(o,e){"use strict";function n(){var n=Math.max(e.documentElement.clientWidth,o.innerWidth||0),r=new google.maps.LatLng(parseFloat(a.map.lat),parseFloat(a.map.lng)),s={zoomControl:!a.controls.zoomControl,zoomControlOptions:{position:google.maps.ControlPosition.RIGHT_CENTER},mapTypeControl:!a.controls.mapTypeControl,streetViewControl:!a.controls.streetViewControl,scrollwheel:!a.mobile.scrollwheel,draggable:n>480||!t(),center:r,zoom:parseInt(a.map.zoom),mapTypeId:google.maps.MapTypeId[a.map.type],mapTypeControlOptions:{style:google.maps.MapTypeControlStyle.DROPDOWN_MENU,position:google.maps.ControlPosition.TOP_LEFT},styles:a.map.styles,fullscreenControl:!a.controls.fullscreenControl,fullscreenControlOptions:{position:google.maps.ControlPosition.RIGHT_TOP},gestureHandling:a.mobile.gestureHandling||"auto"},m=new google.maps.Map(i,s);if(1===a.marker.enabled){var p=new google.maps.Marker({position:r,map:m,optimized:!1,title:a.marker.title,icon:a.marker.file||a.marker.color||""});if("NONE"!==a.marker.animation&&p.setAnimation(google.maps.Animation[a.marker.animation]),1===a.info_window.enabled){var g=new google.maps.InfoWindow({content:a.info_window.text});google.maps.event.addListener(m,"click",function(){g.close()})}}1===a.marker.enabled&&1===a.info_window.enabled&&(google.maps.event.addListener(p,"click",function(){g.open(m,p),p.setAnimation(null)}),1===a.info_window.state&&o.setTimeout(function(){g.open(m,p),p.setAnimation(null)},2e3));var d;google.maps.event.addDomListener(o,"resize",function(){d&&clearTimeout(d),d=o.setTimeout(function(){m.setCenter(r)},300)}),l.map=m,l.marker=p,l.infoWindow=g,o.dispatchEvent(new Event("agm.loaded"))}function t(){return"ontouchstart"in o||navigator.maxTouchPoints}var a=o._agmOpt,l=o.AGM={},i=e.getElementById("agm-canvas");"undefined"!=typeof i&&i&&("object"==typeof google&&google.maps?google.maps.event.addDomListener(o,"load",n):(i.innerHTML='<p class="map-not-loaded" style="text-align: center">Failed to load Google Map.<br>Please try again.</p>',i.style.height="auto"))}(window,document);

  • ank-google-map/trunk/inc/class-frontend.php

    r1600600 r1607007  
    9898
    9999        ob_start();// ob_start is here for a reason
     100        // Do something before shortcode
     101        do_action('agm-before-shortcode');
     102
    100103        $db = $this->db;
    101104
    … …  
    115118        // Enqueue frontend js file
    116119        $is_min = (defined('WP_DEBUG') && WP_DEBUG == true) ? '' : '.min';
    117         wp_enqueue_script('agm-frontend-js', plugins_url('assets/frontend' . $is_min . '.js', AGM_BASE_FILE), array('agm-google-map-api'), AGM_PLUGIN_VERSION, true);
     120        wp_enqueue_script('agm-frontend-js', plugins_url('assets/frontend' . $is_min . '.js', AGM_BASE_FILE), array(), AGM_PLUGIN_VERSION, true);
    118121
    119122        // WP inbuilt hack to print js options object just before this script
    120123        wp_localize_script('agm-frontend-js', '_agmOpt', $this->get_js_options());
     124        // Do something after shortcode
     125        do_action('agm-after-shortcode');
     126
    121127        return ob_get_clean();
    122128    }

  • ank-google-map/trunk/languages/ank-google-map.pot

    r1503318 r1607007  
    55"Project-Id-Version: Ank Google Map\n"
    66"Report-Msgid-Bugs-To: https://github.com/ankurk91/wp-google-map/issues\n"
    7 "POT-Creation-Date: 2016-09-27 10:07+0530\n"
     7"POT-Creation-Date: 2017-03-03 12:35+0530\n"
    88"PO-Revision-Date: 2016-01-13 17:06+0530\n"
    99"Last-Translator: ankurk91\n"
    … …  
    2424"X-Poedit-SearchPath-1: inc\n"
    2525
    26 #: inc/class-admin.php:122
     26#: inc/class-admin.php:56
    2727msgid "Settings"
    2828msgstr ""
    2929
    30 #: inc/class-admin.php:172
     30#: inc/class-settings.php:103
     31msgid "You do not have sufficient permissions to access this page."
     32msgstr ""
     33
     34#: inc/class-settings.php:146
    3135msgid "Invalid Latitude format"
    3236msgstr ""
    3337
    34 #: inc/class-admin.php:176
     38#: inc/class-settings.php:150
    3539msgid "Invalid Longitude format"
    3640msgstr ""
    3741
    38 #: inc/class-admin.php:208
     42#: inc/class-settings.php:183
    3943msgid "Settings saved. Use this shortcode"
    40 msgstr ""
    41 
    42 #: inc/class-admin.php:221
    43 msgid "You do not have sufficient permissions to access this page."
    4444msgstr ""
    4545
    … …  
    117117
    118118#: views/settings.php:83
     119msgid "Scrolling and Panning Behavior"
     120msgstr ""
     121
     122#: views/settings.php:88
     123msgid "None"
     124msgstr ""
     125
     126#: views/settings.php:90
     127msgid "Auto (recommended)"
     128msgstr ""
     129
     130#: views/settings.php:92
     131msgid "Greedy"
     132msgstr ""
     133
     134#: views/settings.php:94
     135msgid "Cooperative"
     136msgstr ""
     137
     138#: views/settings.php:98
     139msgid "Applies to mobile devices"
     140msgstr ""
     141
     142#: views/settings.php:102
    119143msgid "Map Language"
    120144msgstr ""
    121145
    122 #: views/settings.php:98
     146#: views/settings.php:117
    123147msgid "Latitude"
    124148msgstr ""
    125149
    126 #: views/settings.php:103
     150#: views/settings.php:122
    127151msgid "Longitude"
    128152msgstr ""
    129153
    130 #: views/settings.php:108
     154#: views/settings.php:127
    131155msgid "Zoom Level"
    132156msgstr ""
    133157
    134 #: views/settings.php:118
     158#: views/settings.php:137
    135159msgid "Disable Controls"
    136160msgstr ""
    137161
    138 #: views/settings.php:122
     162#: views/settings.php:141
    139163msgid "Disable Zoom Control"
    140164msgstr ""
    141165
    142 #: views/settings.php:125
     166#: views/settings.php:144
    143167msgid "Disable MapType Control"
    144168msgstr ""
    145169
    146 #: views/settings.php:128
     170#: views/settings.php:147
    147171msgid "Disable StreetView Control"
    148172msgstr ""
    149173
    150 #: views/settings.php:131
     174#: views/settings.php:150
    151175msgid "Disable FullScreen Control"
    152176msgstr ""
    153177
    154 #: views/settings.php:135
     178#: views/settings.php:154
    155179msgid "Map Type"
    156180msgstr ""
    157181
    158 #: views/settings.php:139
     182#: views/settings.php:158
    159183msgid "ROADMAP"
    160184msgstr ""
    161185
    162 #: views/settings.php:142
     186#: views/settings.php:161
    163187msgid "SATELLITE"
    164188msgstr ""
    165189
    166 #: views/settings.php:145
     190#: views/settings.php:164
    167191msgid "HYBRID"
    168192msgstr ""
    169193
    170 #: views/settings.php:148
     194#: views/settings.php:167
    171195msgid "TERRAIN"
    172196msgstr ""
    173197
    174 #: views/settings.php:153
     198#: views/settings.php:172
    175199msgid "Map Style"
    176200msgstr ""
    177201
    178 #: views/settings.php:164
     202#: views/settings.php:183
    179203msgid "Styles taken from"
    180204msgstr ""
    181205
    182 #: views/settings.php:169
     206#: views/settings.php:188
    183207msgid "Set Location"
    184208msgstr ""
    185209
    186 #: views/settings.php:173
     210#: views/settings.php:192
    187211msgid "Right click on map to set that point as new center of map"
    188212msgstr ""
    189213
    190 #: views/settings.php:182
     214#: views/settings.php:201
    191215msgid "Enable Marker"
    192216msgstr ""
    193217
    194 #: views/settings.php:186 views/settings.php:260
     218#: views/settings.php:205 views/settings.php:283
    195219msgid "Check to enable"
    196220msgstr ""
    197221
    198 #: views/settings.php:189
     222#: views/settings.php:208
    199223msgid "Marker Title"
    200224msgstr ""
    201225
    202 #: views/settings.php:193
     226#: views/settings.php:212
    203227msgid "Don't use html tags here"
    204228msgstr ""
    205229
    206 #: views/settings.php:197
     230#: views/settings.php:216
    207231msgid "Marker Animation"
    208232msgstr ""
    209233
    210 #: views/settings.php:201
     234#: views/settings.php:220
    211235msgid "NONE"
    212236msgstr ""
    213237
    214 #: views/settings.php:204
     238#: views/settings.php:223
    215239msgid "BOUNCE"
    216240msgstr ""
    217241
    218 #: views/settings.php:207
     242#: views/settings.php:226
    219243msgid "DROP"
    220244msgstr ""
    221245
    222 #: views/settings.php:212
     246#: views/settings.php:231
    223247msgid "Marker Color"
    224248msgstr ""
    225249
    226 #: views/settings.php:216
     250#: views/settings.php:235
    227251msgid "Default"
    228252msgstr ""
    229253
    230 #: views/settings.php:218
     254#: views/settings.php:237
    231255msgid "Light Red"
    232256msgstr ""
    233257
    234 #: views/settings.php:220
     258#: views/settings.php:239
    235259msgid "Black"
    236260msgstr ""
    237261
    238 #: views/settings.php:223
     262#: views/settings.php:242
    239263msgid "Gray"
    240264msgstr ""
    241265
    242 #: views/settings.php:226
     266#: views/settings.php:245
    243267msgid "Orange"
    244268msgstr ""
    245269
    246 #: views/settings.php:229
     270#: views/settings.php:248
    247271msgid "White"
    248272msgstr ""
    249273
    250 #: views/settings.php:232
     274#: views/settings.php:251
    251275msgid "Yellow"
    252276msgstr ""
    253277
    254 #: views/settings.php:235
     278#: views/settings.php:254
    255279msgid "Purple"
    256280msgstr ""
    257281
    258 #: views/settings.php:238
     282#: views/settings.php:257
    259283msgid "Green"
    260284msgstr ""
    261285
    262 #: views/settings.php:244
     286#: views/settings.php:263
    263287msgid "Marker File URL"
    264288msgstr ""
    265289
    266 #: views/settings.php:249
     290#: views/settings.php:269
     291msgid "Select from Media Library"
     292msgstr ""
     293
     294#: views/settings.php:272
    267295msgid "Full URL to marker icon image file"
    268296msgstr ""
    269297
    270 #: views/settings.php:257
     298#: views/settings.php:280
    271299msgid "Enable Info Window"
    272300msgstr ""
    273301
    274 #: views/settings.php:261
     302#: views/settings.php:284
    275303msgid "Needs marker to be enabled"
    276304msgstr ""
    277305
    278 #: views/settings.php:265
     306#: views/settings.php:288
    279307msgid "Info Window State"
    280308msgstr ""
    281309
    282 #: views/settings.php:269
     310#: views/settings.php:292
    283311msgid "Shown by default"
    284312msgstr ""
    285313
    286 #: views/settings.php:272
     314#: views/settings.php:295
    287315msgid "Info Window Text"
    288316msgstr ""
    289317
    290 #: views/settings.php:284
     318#: views/settings.php:307
    291319msgid "HTML allowed"
    292320msgstr ""

  • ank-google-map/trunk/readme.txt

    r1600600 r1607007  
    33Requires at least: 4.0.0
    44Tested up to: 4.7.2
    5 Stable tag: 2.4.0
     5Stable tag: 2.5.0
    66License: MIT
    77License URI: https://opensource.org/licenses/MIT
    … …  
    155155
    156156== Upgrade Notice ==
    157 Please upgrade to v2.0.0 for  better experience
     157Please upgrade to v2.0.0 for better experience
    158158
    159159== Screenshots ==
    … …  
    165165
    166166== Changelog ==
     167
     168= 2.5.0 =
     169* Add: Expose Google Map object to `window`, [read](https://github.com/ankurk91/wp-google-map/wiki/Hook-into-JS)
     170* Add: Expose two actions before and after shortcode, [read](https://github.com/ankurk91/wp-google-map/wiki/Before-and-After-shortcode-actions)
    167171
    168172= 2.4.0 =
Note: See TracChangeset for help on using the changeset viewer.