added es6 to es5 conversion for some modules, fixed issue #1485

js/apps/system/_admin/aardvark/APP/GruntFile.js

@@ -81,7 +81,7 @@
             "frontend/js/arango/arango.js",
             "frontend/js/arango/templateEngine.js",
             "frontend/js/shell/browser.js",
-            "frontend/js/config/dygraphConfig.js",
+            "frontend/js/config/dygraphConfig.js",/*
             "frontend/js/modules/underscore.js",
             "frontend/js/modules/org/arangodb/aql/explainer.js",
             "frontend/js/modules/org/arangodb/aql/functions.js",
@@ -105,7 +105,7 @@
             "frontend/js/modules/org/arangodb/simple-query.js",
             "frontend/js/modules/org/arangodb/tutorial.js",
             "frontend/js/modules/org/arangodb-common.js",
-            "frontend/js/modules/org/arangodb.js",
+            "frontend/js/modules/org/arangodb.js",*/
             "frontend/js/bootstrap/errors.js",
             "frontend/js/bootstrap/monkeypatches.js",
             "frontend/js/bootstrap/module-internal.js",
@@ -352,6 +352,20 @@
             }
           }
         },
+        sharedES: {
+          src: [
+            "frontend/js/modules/**/*.js",
+          ],
+          dest: 'frontend/build/arangoes6.js',
+          options: {
+            extractRequired: function () {
+              return [];
+            },
+            extractDeclared: function () {
+              return [];
+            }
+          }
+        },
         jsCluster: {
           src: [
             "frontend/js/lib/dygraph-combined.js",
@@ -448,13 +462,25 @@
         ]
       },
 
+      babel: {
+        options: {
+          sourceMap: false
+        },
+        dist: {
+          files: {
+            'frontend/build/arangoes5.js': 'frontend/build/arangoes6.js'
+          }
+        }
+      },
+
       uglify: {
         dist: {
           files: {
             'frontend/build/app.min.js': 'frontend/build/app.js',
             'clusterFrontend/build/cluster.min.js': 'clusterFrontend/build/cluster.js',
             'frontend/src/ace.min.js': 'frontend/src/ace.js',
-            'build/sharedLibs.min.js': 'build/sharedLibs.js'
+            'build/sharedLibs.min.js': 'build/sharedLibs.js',
+            'frontend/build/arangoes5.min.js': 'frontend/build/arangoes5.js'
           }
         }
       },
@@ -480,11 +506,13 @@
         },
         concat_in_order: {
           files: [
+            '!frontend/js/modules/**/*.js',
             'frontend/js/{,*/}*.js',
             'frontend/js/graphViewer/**/*.js',
             'clusterFrontend/js/{,*/}*.js'
           ],
           tasks: [
+            'concat_in_order:sharedES',
             'concat_in_order:sharedLibs',
             'concat_in_order:default',
             'concat_in_order:jsCluster',
@@ -512,8 +540,9 @@
     grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks("grunt-contrib-concat");
-    grunt.loadNpmTasks('grunt-contrib-htmlmin')
-    grunt.loadNpmTasks('grunt-contrib-uglify')
+    grunt.loadNpmTasks('grunt-contrib-htmlmin');
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    require('load-grunt-tasks')(grunt);
 
     require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
     grunt.loadNpmTasks('grunt-text-replace');
@@ -524,11 +553,13 @@
       'replace',
       'imagemin',
       'concat',
+      'concat_in_order:sharedES',
       'concat_in_order:sharedLibs',
       'concat_in_order:default',
       'concat_in_order:jsCluster',
       'concat_in_order:htmlCluster',
       'concat_in_order:htmlStandalone',
+      'babel',
       'cssmin',
       'uglify',
       'htmlmin',
@@ -541,6 +572,7 @@
       'sass:dev',
       'replace',
       'concat',
+      'concat_in_order:sharedES',
       'concat_in_order:sharedLibs',
       'concat_in_order:default',
       'concat_in_order:jsCluster',
@@ -551,6 +583,7 @@
 
     grunt.registerTask('deploy', [
       'sass:dist',
+      'concat_in_order:sharedES',
       'concat_in_order:sharedLibs',
       'concat_in_order:default',
       'concat_in_order:jsCluster',

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css

@@ -2158,6 +2158,10 @@ div.queryline select, div.queryline input, input.search-input, .modal-body .sele
     margin-left: -5px;
     margin-top: -1px;
     width: 40%; }
+  .navbar .arango-collection-select {
+    position: relative;
+    right: -22px;
+    top: 4px; }
   .navbar .nav .dropdown .active > .dropdown-toggle, .navbar .nav .dropdown .open > .dropdown-toggle, .navbar .nav .dropdown .open.active > .dropdown-toggle {
     background: #788f3d; }
   .navbar .nav > .active > a {
@@ -4900,6 +4904,7 @@ div.dropdownInner {
   div.dropdownInner ul {
     border-left: 1px solid rgba(140, 138, 137, 0.25);
     display: inline;
+    list-style-type: none;
     margin-top: 10px;
     min-height: 105px;
     width: 230px; }

js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part

@@ -1 +1,2 @@
-<script src="app.js?version=1442220392252"></script>
+<script src="app.js?version=1442906628925"></script>
+<script src="arangoes5.js?version=1442906628925"></script>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html

@@ -2640,4 +2640,4 @@ var cutByResolution = function (str) {
         <% }); %>
       </ul>
     </div>
-  <% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><script src="app.js?version=1442220392252"></script></body></html>
+  <% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><script src="app.js?version=1442906628925"></script><script src="arangoes5.js?version=1442906628925"></script></body></html>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html

@@ -2896,7 +2896,8 @@ var cutByResolution = function (str) {
     </div>
   </footer>
 
-<script src="app.js?version=1442220392252"></script>
+<script src="app.js?version=1442906628925"></script>
+<script src="arangoes5.js?version=1442906628925"></script>
 
   </body>
 </html>

js/apps/system/_admin/aardvark/APP/frontend/build/style.css

@@ -2143,6 +2143,10 @@ div.queryline select, div.queryline input, input.search-input, .modal-body .sele
     margin-left: -5px;
     margin-top: -1px;
     width: 40%; }
+  .navbar .arango-collection-select {
+    position: relative;
+    right: -22px;
+    top: 4px; }
   .navbar .nav .dropdown .active > .dropdown-toggle, .navbar .nav .dropdown .open > .dropdown-toggle, .navbar .nav .dropdown .open.active > .dropdown-toggle {
     background: #788f3d; }
   .navbar .nav > .active > a {
@@ -4885,6 +4889,7 @@ div.dropdownInner {
   div.dropdownInner ul {
     border-left: 1px solid rgba(140, 138, 137, 0.25);
     display: inline;
+    list-style-type: none;
     margin-top: 10px;
     min-height: 105px;
     width: 230px; }

js/apps/system/_admin/aardvark/APP/frontend/html/scripts.html.part

@@ -1 +1,2 @@
 <script src="app.js?version=__VERSION"></script>
+<script src="arangoes5.js?version=__VERSION"></script>

js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js

@@ -41,7 +41,7 @@
       }
 
       this.demoView.render();
-      this.naviView.selectMenuItem('demo-menu');
+      //this.naviView.selectMenuItem('demo-menu');
     },
 
     initialize: function () {

js/apps/system/_admin/aardvark/APP/frontend/scss/_dropdowns.scss

@@ -66,6 +66,7 @@ div.dropdownInner {
     @extend %pull-left;
     border-left: 1px solid $c-content-border;
     display: inline;
+    list-style-type: none;
     margin-top: 10px;
     min-height: 105px;
     width: 230px;

js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss

@@ -22,6 +22,12 @@
     width: 40%;
   }
 
+  .arango-collection-select {
+    position: relative;
+    right: -22px;
+    top: 4px;
+  }
+
   .nav {
 
     .dropdown {

js/apps/system/_admin/aardvark/APP/manifest.json

@@ -71,6 +71,10 @@
       "path": "build/sharedLibs.min.js",
       "gzip": true
     },
+    "/arangoes5.js": {
+      "path": "frontend/build/arangoes5.min.js",
+      "gzip": true
+    },
     "/app.js": {
       "path": "frontend/build/app.min.js",
       "gzip": true

js/apps/system/_admin/aardvark/APP/package.json

@@ -9,6 +9,7 @@
   },
   "devDependencies": {
     "grunt": "^0.4.5",
+    "grunt-babel": "^5.0.1",
     "grunt-concat-in-order": "^0.1.6",
     "grunt-contrib-compress": "^0.13.0",
     "grunt-contrib-concat": "^0.5.1",
@@ -17,7 +18,7 @@
     "grunt-contrib-imagemin": "^0.9.4",
     "grunt-contrib-jshint": "^0.11.0",
     "grunt-contrib-sass": "^0.8.1",
-    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-karma": "^0.10.1",
     "grunt-processhtml": "^0.3.8",
@@ -28,6 +29,7 @@
     "karma-coverage": "^0.2.7",
     "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "^0.1.4",
+    "load-grunt-tasks": "^3.2.0",
     "matchdep": "^0.3.0",
     "sass": "^0.5.0"
   },