Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
soal committed May 1, 2019
2 parents 59c7b12 + c650f31 commit 3aac194
Show file tree
Hide file tree
Showing 31 changed files with 162 additions and 177 deletions.
60 changes: 29 additions & 31 deletions dist/vue-mapbox.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,11 @@ module.exports = /******/ (function(modules) {
/***/
},

/***/ "74f8": /***/ function(module, exports, __webpack_require__) {
// extracted by mini-css-extract-plugin
/***/
},

/***/ "7726": /***/ function(module, exports) {
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global = (module.exports =
Expand Down Expand Up @@ -1852,11 +1857,6 @@ module.exports = /******/ (function(modules) {
/***/
},

/***/ "980c": /***/ function(module, exports, __webpack_require__) {
// extracted by mini-css-extract-plugin
/***/
},

/***/ "9b43": /***/ function(module, exports, __webpack_require__) {
// optional / simple context binding
var aFunction = __webpack_require__("d8e8");
Expand Down Expand Up @@ -1936,6 +1936,25 @@ module.exports = /******/ (function(modules) {
/***/
},

/***/ a23d: /***/ function(
module,
__webpack_exports__,
__webpack_require__
) {
"use strict";
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
"74f8"
);
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__
);
/* unused harmony reexport * */
/* unused harmony default export */ var _unused_webpack_default_export =
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a;

/***/
},

/***/ a25f: /***/ function(module, exports, __webpack_require__) {
var global = __webpack_require__("7726");
var navigator = global.navigator;
Expand Down Expand Up @@ -2117,25 +2136,6 @@ module.exports = /******/ (function(modules) {
/***/
},

/***/ b014: /***/ function(
module,
__webpack_exports__,
__webpack_require__
) {
"use strict";
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
"980c"
);
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__
);
/* unused harmony reexport * */
/* unused harmony default export */ var _unused_webpack_default_export =
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a;

/***/
},

/***/ bcaa: /***/ function(module, exports, __webpack_require__) {
var anObject = __webpack_require__("cb7c");
var isObject = __webpack_require__("d3f4");
Expand Down Expand Up @@ -2530,7 +2530,7 @@ module.exports = /******/ (function(modules) {
// Indicate to webpack that this file can be concatenated
/* harmony default export */ var setPublicPath = null;

// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47f5d000-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/map/GlMap.vue?vue&type=template&id=9b87638e&scoped=true&
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47f5d000-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/map/GlMap.vue?vue&type=template&id=177ac976&
var render = function() {
var _vm = this;
var _h = _vm.$createElement;
Expand All @@ -2551,7 +2551,7 @@ module.exports = /******/ (function(modules) {
}
];

// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=template&id=9b87638e&scoped=true&
// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=template&id=177ac976&

// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom.iterable.js
var web_dom_iterable = __webpack_require__("ac6a");
Expand Down Expand Up @@ -3325,10 +3325,8 @@ module.exports = /******/ (function(modules) {
};
// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=script&lang=js&
/* harmony default export */ var map_GlMapvue_type_script_lang_js_ = GlMapvue_type_script_lang_js_;
// EXTERNAL MODULE: ./src/components/map/GlMap.vue?vue&type=style&index=0&id=9b87638e&scoped=true&lang=css&
var GlMapvue_type_style_index_0_id_9b87638e_scoped_true_lang_css_ = __webpack_require__(
"b014"
);
// EXTERNAL MODULE: ./src/components/map/GlMap.vue?vue&type=style&index=0&lang=css&
var GlMapvue_type_style_index_0_lang_css_ = __webpack_require__("a23d");

// CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
/* globals __VUE_SSR_CONTEXT__ */
Expand Down Expand Up @@ -3441,7 +3439,7 @@ module.exports = /******/ (function(modules) {
staticRenderFns,
false,
null,
"9b87638e",
null,
null
);

Expand Down
5 changes: 2 additions & 3 deletions dist/vue-mapbox.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
.mgl-map-wrapper[data-v-9b87638e] {
.mgl-map-wrapper {
height: 100%;
position: relative;
width: 100%;
}
.mapboxgl-map[data-v-9b87638e] {
.mgl-map-wrapper .mapboxgl-map {
height: 100%;
left: 0;
overflow: hidden;
position: absolute;
top: 0;
width: 100%;
Expand Down
60 changes: 29 additions & 31 deletions dist/vue-mapbox.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,11 @@
/***/
},

/***/ "74f8": /***/ function(module, exports, __webpack_require__) {
// extracted by mini-css-extract-plugin
/***/
},

/***/ "7726": /***/ function(module, exports) {
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
var global = (module.exports =
Expand Down Expand Up @@ -1886,11 +1891,6 @@
/***/
},

/***/ "980c": /***/ function(module, exports, __webpack_require__) {
// extracted by mini-css-extract-plugin
/***/
},

/***/ "9b43": /***/ function(module, exports, __webpack_require__) {
// optional / simple context binding
var aFunction = __webpack_require__("d8e8");
Expand Down Expand Up @@ -1970,6 +1970,25 @@
/***/
},

/***/ a23d: /***/ function(
module,
__webpack_exports__,
__webpack_require__
) {
"use strict";
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
"74f8"
);
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__
);
/* unused harmony reexport * */
/* unused harmony default export */ var _unused_webpack_default_export =
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a;

/***/
},

/***/ a25f: /***/ function(module, exports, __webpack_require__) {
var global = __webpack_require__("7726");
var navigator = global.navigator;
Expand Down Expand Up @@ -2151,25 +2170,6 @@
/***/
},

/***/ b014: /***/ function(
module,
__webpack_exports__,
__webpack_require__
) {
"use strict";
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
"980c"
);
/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__
);
/* unused harmony reexport * */
/* unused harmony default export */ var _unused_webpack_default_export =
_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_index_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_GlMap_vue_vue_type_style_index_0_id_9b87638e_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a;

/***/
},

/***/ bcaa: /***/ function(module, exports, __webpack_require__) {
var anObject = __webpack_require__("cb7c");
var isObject = __webpack_require__("d3f4");
Expand Down Expand Up @@ -2566,7 +2566,7 @@
// Indicate to webpack that this file can be concatenated
/* harmony default export */ var setPublicPath = null;

// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47f5d000-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/map/GlMap.vue?vue&type=template&id=9b87638e&scoped=true&
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"47f5d000-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/map/GlMap.vue?vue&type=template&id=177ac976&
var render = function() {
var _vm = this;
var _h = _vm.$createElement;
Expand All @@ -2590,7 +2590,7 @@
}
];

// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=template&id=9b87638e&scoped=true&
// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=template&id=177ac976&

// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom.iterable.js
var web_dom_iterable = __webpack_require__("ac6a");
Expand Down Expand Up @@ -3373,10 +3373,8 @@
};
// CONCATENATED MODULE: ./src/components/map/GlMap.vue?vue&type=script&lang=js&
/* harmony default export */ var map_GlMapvue_type_script_lang_js_ = GlMapvue_type_script_lang_js_;
// EXTERNAL MODULE: ./src/components/map/GlMap.vue?vue&type=style&index=0&id=9b87638e&scoped=true&lang=css&
var GlMapvue_type_style_index_0_id_9b87638e_scoped_true_lang_css_ = __webpack_require__(
"b014"
);
// EXTERNAL MODULE: ./src/components/map/GlMap.vue?vue&type=style&index=0&lang=css&
var GlMapvue_type_style_index_0_lang_css_ = __webpack_require__("a23d");

// CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
/* globals __VUE_SSR_CONTEXT__ */
Expand Down Expand Up @@ -3489,7 +3487,7 @@
staticRenderFns,
false,
null,
"9b87638e",
null,
null
);

Expand Down
18 changes: 9 additions & 9 deletions dist/vue-mapbox.umd.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,7 @@
throw TypeError("Can't convert object to primitive value");
};
},
"74f8": function(t, e, n) {},
7726: function(t, e) {
var n = (t.exports =
"undefined" != typeof window && window.Math == Math
Expand Down Expand Up @@ -1311,7 +1312,6 @@
return r(t, o);
};
},
"980c": function(t, e, n) {},
"9b43": function(t, e, n) {
var r = n("d8e8");
t.exports = function(t, e, n) {
Expand Down Expand Up @@ -1371,6 +1371,12 @@
);
});
},
a23d: function(t, e, n) {
"use strict";
var r = n("74f8"),
o = n.n(r);
o.a;
},
a25f: function(t, e, n) {
var r = n("7726"),
o = r.navigator;
Expand Down Expand Up @@ -1501,12 +1507,6 @@
for (v in r) _[v] || i(_, v, r[v], !0);
}
},
b014: function(t, e, n) {
"use strict";
var r = n("980c"),
o = n.n(r);
o.a;
},
bcaa: function(t, e, n) {
var r = n("cb7c"),
o = n("d3f4"),
Expand Down Expand Up @@ -2188,7 +2188,7 @@
}
},
S = x;
n("b014");
n("a23d");
function $(t, e, n, r, o, i, a, s) {
var c,
u = "function" === typeof t ? t.options : t;
Expand Down Expand Up @@ -2233,7 +2233,7 @@
}
return { exports: t, options: u };
}
var I = $(S, o, i, !1, null, "9b87638e", null);
var I = $(S, o, i, !1, null, null, null);
I.options.__file = "GlMap.vue";
var w = I.exports,
E = {
Expand Down
Loading

0 comments on commit 3aac194

Please sign in to comment.