Merge remote-tracking branch 'origin/release-0.3' into develop

cvat/apps/engine/static/engine/js/base.js

@@ -6,8 +6,6 @@
 
 /* exported
     ExportType
-    IncrementIdGenerator
-    ConstIdGenerator
     confirm
     createExportContainer
     dumpAnnotationRequest
@@ -245,30 +243,6 @@ function getExportTargetContainer(export_type, shape_type, container) {
     return shape_container_target;
 }
 
-class IncrementIdGenerator {
-    constructor(startId=0) {
-        this._startId = startId;
-    }
-
-    next() {
-        return this._startId++;
-    }
-
-    reset(startId=0) {
-        this._startId = startId;
-    }
-}
-
-class ConstIdGenerator {
-    constructor(startId=-1) {
-        this._startId = startId;
-    }
-
-    next() {
-        return this._startId;
-    }
-}
-
 /* These HTTP methods do not require CSRF protection */
 function csrfSafeMethod(method) {
     return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));

cvat/apps/engine/static/engine/js/idGenerator.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+ /* exported
+    IncrementIdGenerator
+    ConstIdGenerator
+*/
+
+"use strict";
+
+class IncrementIdGenerator {
+    constructor(startId=0) {
+        this._startId = startId;
+    }
+
+    next() {
+        return this._startId++;
+    }
+
+    reset(startId=0) {
+        this._startId = startId;
+    }
+}
+
+class ConstIdGenerator {
+    constructor(startId=-1) {
+        this._startId = startId;
+    }
+
+    next() {
+        return this._startId;
+    }
+}

cvat/apps/engine/templates/engine/base.html

@@ -37,6 +37,7 @@
         {% compress js file cvat %}
             {% block head_js_cvat %}
                 <script type="text/javascript" src="{% static 'engine/js/base.js' %}"></script>
+                <script type="text/javascript" src="{% static 'engine/js/idGenerator.js' %}"></script>
                 <script type="text/javascript" src="{% static 'engine/js/userConfig.js' %}"></script>
             {% endblock %}
         {% endcompress %}

tests/eslintrc.conf.js

@@ -52,6 +52,7 @@ module.exports = {
         'createExportContainer': true,
         'ExportType': true,
         'getExportTargetContainer': true,
+        // from idGenerator.js
         'IncrementIdGenerator': true,
         'ConstIdGenerator': true,
         // from shapeCollection.js

tests/karma.conf.js

@@ -10,6 +10,7 @@ module.exports = function(config) {
     basePath: path.join(process.env.HOME, 'cvat/apps/'),
     frameworks: ['qunit'],
     files: [
+      'engine/static/engine/js/idGenerator.js',
       'engine/static/engine/js/labelsInfo.js',
       'engine/static/engine/js/annotationParser.js',
       'engine/static/engine/js/listener.js',