Merge branch 'v3-dev' into v3

ethercreative · Jan 24, 2018 · 4c3b099 · 4c3b099
2 parents 91eadc8 + bf2e67c
commit 4c3b099
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 332 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,4 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
-vendor/
+vendor
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 3.2.0 - WIP
+### Fixed
+- Not #70 yet
+
+### Improved
+- Updated CraftQL support (via @markhuot)
+- Updated Mapbox example to use latest API
+- Improved address and lat/lng input sizing on smaller screens and in a HUD
+
 ## 3.1.3 - 2017-12-18
 ### Fixed
 - Map fields no longer cause global sets to fail to save!

diff --git a/README.md b/README.md
@@ -87,8 +87,8 @@ Using [Google Maps](https://developers.google.com/maps/documentation/javascript/
 And [Mapbox](https://www.mapbox.com/mapbox-gl-js/api/):
 
 ```twig
-<script src="https://api.mapbox.com/mapbox-gl-js/v0.21.0/mapbox-gl.js"></script>
-<link href="https://api.mapbox.com/mapbox-gl-js/v0.21.0/mapbox-gl.css" rel="stylesheet" />
+<script src="https://api.mapbox.com/mapbox-gl-js/v0.43.0/mapbox-gl.js"></script>
+<link href="https://api.mapbox.com/mapbox-gl-js/v0.43.0/mapbox-gl.css" rel="stylesheet" />
 
 <div id="map" style="width: 400px; height: 300px;"></div>
 <script>

diff --git a/composer.json b/composer.json
@@ -1,13 +1,12 @@
 {
   "name": "ether/simplemap",
   "description": "A beautifully simple Google Map field type.",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "type": "craft-plugin",
   "license": "MIT",
   "minimum-stability": "dev",
   "require": {
-    "craftcms/cms": "^3.0.0-beta.20",
-    "webonyx/graphql-php": "^0.10.0"
+    "craftcms/cms": "^3.0.0-beta.20"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/SimpleMap.php b/src/SimpleMap.php
@@ -11,6 +11,7 @@
 use craft\services\Plugins;
 use craft\web\twig\variables\CraftVariable;
 use ether\simplemap\fields\MapField;
+use ether\simplemap\listeners\GetCraftQLSchema;
 use ether\simplemap\models\Settings;
 use ether\simplemap\services\MapService;
 use yii\base\Event;
@@ -76,6 +77,17 @@ public function init ()
 			CraftVariable::EVENT_INIT,
 			[$this, 'onRegisterVariable']
 		);
+
+		// CraftQL Support
+		/** @noinspection PhpUndefinedNamespaceInspection */
+		/** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+		if (class_exists(\markhuot\CraftQL\CraftQL::class)) {
+            Event::on(
+                MapField::class,
+                'craftQlGetFieldSchema',
+                [new GetCraftQLSchema, 'handle']
+            );
+        }
 	}
 
 	// Craft: Settings
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ Network Trash Folder @@
     Temporary Items
     .apdisk
-    vendor/
+    vendor