aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-09 12:41:38 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-09 12:41:38 +1200
commit32c836e90bd75e68cac1d704b048a3c4ff22775f (patch)
tree759da64d5008dfe44e0fa00f8632cf6d37053b7a
parent8fd204e20c089a3ddc4930e8959b0ee851968b43 (diff)
downloadtrackermap-server-32c836e90bd75e68cac1d704b048a3c4ff22775f.tar.gz
trackermap-server-32c836e90bd75e68cac1d704b048a3c4ff22775f.tar.bz2
trackermap-server-32c836e90bd75e68cac1d704b048a3c4ff22775f.zip
Update JavaScript libraries
-rw-r--r--web/arrowstyle.js14
-rw-r--r--web/debug.html6
-rw-r--r--web/release.html6
3 files changed, 13 insertions, 13 deletions
diff --git a/web/arrowstyle.js b/web/arrowstyle.js
index a39e04cdf..1fd2b3c00 100644
--- a/web/arrowstyle.js
+++ b/web/arrowstyle.js
@@ -123,7 +123,7 @@ ol.style.Arrow = function(options) {
var rotateWithView = options.rotateWithView !== undefined ?
options.rotateWithView : false;
- goog.base(this, {
+ ol.style.Image.call(this, {
opacity: 1,
rotateWithView: rotateWithView,
rotation: options.rotation !== undefined ? options.rotation : 0,
@@ -132,7 +132,7 @@ ol.style.Arrow = function(options) {
});
};
-goog.inherits(ol.style.Arrow, ol.style.Image);
+ol.inherits(ol.style.Arrow, ol.style.Image);
/**
@@ -282,7 +282,7 @@ ol.style.Arrow.prototype.unlistenImageChange = ol.nullFunction;
* miterLimit: number
* }}
*/
-ol.style.Arrow.RenderOptions;
+ol.ArrowRenderOptions;
/**
@@ -324,7 +324,7 @@ ol.style.Arrow.prototype.render_ = function(atlasManager) {
var size = 2 * (this.radius_ + strokeWidth) + 1;
- /** @type {ol.style.Arrow.RenderOptions} */
+ /** @type {ol.ArrowRenderOptions} */
var renderOptions = {
strokeStyle: strokeStyle,
strokeWidth: strokeWidth,
@@ -387,7 +387,7 @@ ol.style.Arrow.prototype.render_ = function(atlasManager) {
/**
* @private
- * @param {ol.style.Arrow.RenderOptions} renderOptions Render options.
+ * @param {ol.ArrowRenderOptions} renderOptions Render options.
* @param {CanvasRenderingContext2D} context The rendering context.
* @param {number} x The origin for the symbol (x).
* @param {number} y The origin for the symbol (y).
@@ -438,7 +438,7 @@ ol.style.Arrow.prototype.draw_ = function(renderOptions, context, x, y) {
/**
* @private
- * @param {ol.style.Arrow.RenderOptions} renderOptions Render options.
+ * @param {ol.ArrowRenderOptions} renderOptions Render options.
*/
ol.style.Arrow.prototype.createHitDetectionCanvas_ = function(renderOptions) {
this.hitDetectionImageSize_ = [renderOptions.size, renderOptions.size];
@@ -458,7 +458,7 @@ ol.style.Arrow.prototype.createHitDetectionCanvas_ = function(renderOptions) {
/**
* @private
- * @param {ol.style.Arrow.RenderOptions} renderOptions Render options.
+ * @param {ol.ArrowRenderOptions} renderOptions Render options.
* @param {CanvasRenderingContext2D} context The context.
* @param {number} x The origin for the symbol (x).
* @param {number} y The origin for the symbol (y).
diff --git a/web/debug.html b/web/debug.html
index 4331a5e9a..0e9576323 100644
--- a/web/debug.html
+++ b/web/debug.html
@@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Traccar</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/classic/theme-neptune/resources/theme-neptune-all.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.15.1/ol.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.1/css/font-awesome.min.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.17.1/ol.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="app.css">
</head>
<body>
@@ -14,7 +14,7 @@
<div id="attribution">Powered by <a href="https://www.traccar.org/">Traccar GPS Tracking System</a></div>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/ext-all-debug.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/classic/theme-neptune/theme-neptune.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.15.1/ol-debug.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.17.1/ol-debug.js"></script>
<script src="arrowstyle.js"></script>
<script type="text/javascript">
Ext.Loader.setConfig({ disableCaching: false });
diff --git a/web/release.html b/web/release.html
index bcf6f9bad..4e087922a 100644
--- a/web/release.html
+++ b/web/release.html
@@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>Traccar</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/classic/theme-neptune/resources/theme-neptune-all.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.15.1/ol.css">
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.1/css/font-awesome.min.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/ol3/3.17.1/ol.css">
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
<link rel="stylesheet" href="app.css">
</head>
<body>
@@ -14,7 +14,7 @@
<div id="attribution">Powered by <a href="https://www.traccar.org/">Traccar GPS Tracking System</a></div>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/ext-all.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/classic/theme-neptune/theme-neptune.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.15.1/ol-debug.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ol3/3.17.1/ol-debug.js"></script>
<script src="arrowstyle.js"></script>
<script src="locale.js"></script>
<script type="text/javascript">