Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
Miggets7 committed Feb 4, 2019
2 parents e21c8a5 + a6996f6 commit 4b86fe1cd2bb35f5e566284e3a1beae397a018a4
@@ -123,6 +123,8 @@
ready() {
super.ready();
this.$.queryParams.paramsString = window.location.search.slice(1);
let queryParams = this.$.queryParams.paramsObject;
// If console query parameters set then they take precedence
if (queryParams.consoleName) {
@@ -11,8 +11,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
"lit-element": "^2.0.0-rc.2",
"lit-html": "1.0.0-rc.2"
"lit-element": "^2.0.0-rc.2"
},
"devDependencies": {
"@polymer/decorators": "^3.0.0",
@@ -1,4 +1,4 @@
import {html} from 'lit-html';
import {html} from 'lit-element';
export const OrHeaderStyle = html`
<style>
or-header a, a:link, a:visited {
@@ -1,7 +1,7 @@
{
"name": "@openremote/or-map",
"version": "1.0.0-alpha",
"description": "Displays s vector or raster mapx",
"description": "Displays s vector or raster map",
"main": "dist/index.js",
"types": "src/index.ts",
"scripts": {
@@ -13,7 +13,8 @@ module.exports = {
devtool: 'inline-source-map',
devServer: {
port: 9000,
contentBase: './dist'
contentBase: './dist',
publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"
},
plugins: [
new HtmlWebpackPlugin({
@@ -47,7 +47,8 @@ module.exports = {
devtool: 'inline-source-map',
devServer: {
port: 9000,
contentBase: './dist'
contentBase: './dist',
publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"
},
plugins: [
new HtmlWebpackPlugin({
@@ -11,7 +11,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/or-map": "^1.0.0",
"@openremote/or-map": "^1.0.0-alpha",
"source-map-loader": "^0.2.4"
},
"devDependencies": {
@@ -22,11 +22,12 @@
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/runtime": "^7.2.0",
"babel-loader": "^8.0.4",
"@polymer/iron-demo-helpers": "^3.0.0-pre.19",
"babel-loader": "^8.0.4",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.0",
"css-loader": "^2.0.0",
"fast-async": "^6.3.8",
"file-loader": "^2.0.0",
"html-webpack-plugin": "^3.2.0",
"raw-loader": "^0.5.1",
@@ -5,6 +5,8 @@
"../../component/or-map/@types"
],
"references": [
{ "path": "../../component/core" },
{ "path": "../../component/rest" },
{ "path": "../../component/or-map" }
]
}
@@ -15,7 +15,8 @@ module.exports = {
devtool: 'inline-source-map',
devServer: {
port: 9000,
contentBase: './dist'
contentBase: './dist',
publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"
},
plugins: [
new HtmlWebpackPlugin({
@@ -47,7 +47,8 @@ module.exports = {
devtool: 'inline-source-map',
devServer: {
port: 9000,
contentBase: './dist'
contentBase: './dist',
publicPath: "/" + __dirname.split(path.sep).slice(-1)[0] + "/"
},
plugins: [
new HtmlWebpackPlugin({

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 4b86fe1

Please sign in to comment.