Repository: ambari
Updated Branches:
  refs/heads/trunk f90b55a8b -> a9bbf4644


AMBARI-18180 Add ES6 support to Ambari Web. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9bbf464
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9bbf464
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9bbf464

Branch: refs/heads/trunk
Commit: a9bbf4644890690c45e9879f7bda9ff9d0ec7000
Parents: f90b55a
Author: ababiichuk <ababiic...@hortonworks.com>
Authored: Thu Aug 25 16:15:22 2016 +0300
Committer: ababiichuk <ababiic...@hortonworks.com>
Committed: Tue Sep 20 11:19:32 2016 +0300

----------------------------------------------------------------------
 .../views/common/widget/graph_widget_view.js    |   7 +-
 ambari-web/brunch-config.js                     | 125 +++++++++++++++++++
 ambari-web/config.coffee                        | 112 -----------------
 ambari-web/package.json                         |   1 +
 4 files changed, 129 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9bbf464/ambari-web/app/views/common/widget/graph_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js 
b/ambari-web/app/views/common/widget/graph_widget_view.js
index 2ee76be..324358e 100644
--- a/ambari-web/app/views/common/widget/graph_widget_view.js
+++ b/ambari-web/app/views/common/widget/graph_widget_view.js
@@ -351,12 +351,11 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, 
App.ExportMetricsMixin, {
       if (!arguments.length || this.get('parentView.data.length')) {
         this.loadData();
       }
-      var self = this;
       Em.run.next(function () {
         if (self.get('isPreview')) {
-          App.tooltip(this.$("[rel='ZoomInTooltip']"), 'disable');
+          App.tooltip(self.$("[rel='ZoomInTooltip']"), 'disable');
         } else {
-          App.tooltip(this.$("[rel='ZoomInTooltip']"), {
+          App.tooltip(self.$("[rel='ZoomInTooltip']"), {
             placement: 'left',
             template: '<div class="tooltip"><div 
class="tooltip-arrow"></div><div class="tooltip-inner 
graph-tooltip"></div></div>'
           });
@@ -382,4 +381,4 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, 
App.ExportMetricsMixin, {
       App.showAlertPopup(Em.I18n.t('graphs.noData.title'), 
Em.I18n.t('graphs.noData.tooltip.title'));
     }
   }
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9bbf464/ambari-web/brunch-config.js
----------------------------------------------------------------------
diff --git a/ambari-web/brunch-config.js b/ambari-web/brunch-config.js
new file mode 100644
index 0000000..64ac946
--- /dev/null
+++ b/ambari-web/brunch-config.js
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+module.exports.config = {
+  plugins: {
+    babel: {
+      ignore: [
+        /^(vendor|app\/data|app\/assets|test)/
+      ],
+      pattern: /\.(js)$/
+    }
+  },
+  files: {
+    javascripts: {
+      joinTo: {
+        'javascripts/app.js': /^app/,
+        'javascripts/vendor.js': /^vendor/,
+        'test/javascripts/test.js': /^test(\/|\\)(?!vendor)/,
+        'test/javascripts/test-vendor.js': /^test(\/|\\)(?=vendor)/
+      },
+      order: {
+        before: [
+          'vendor/scripts/console-helper.js',
+          'vendor/scripts/jquery-1.7.2.min.js',
+          'vendor/scripts/handlebars-1.0.0.beta.6.js',
+          'vendor/scripts/ember-latest.js',
+          'vendor/scripts/ember-data-latest.js',
+          'vendor/scripts/ember-i18n-1.4.1.js',
+          'vendor/scripts/bootstrap.js',
+          'vendor/scripts/bootstrap-combobox.js',
+          'vendor/scripts/bootstrap-checkbox.js',
+          'vendor/scripts/bootstrap-slider.min.js',
+          'vendor/scripts/bootstrap-switch.min.js',
+          'vendor/scripts/d3.v2.js',
+          'vendor/scripts/cubism.v1.js',
+          'vendor/scripts/jquery.ui.core.js',
+          'vendor/scripts/jquery.ui.position.js',
+          'vendor/scripts/jquery.ui.widget.js',
+          'vendor/scripts/jquery.ui.autocomplete.js',
+          'vendor/scripts/jquery.ui.mouse.js',
+          'vendor/scripts/jquery.ui.datepicker.js',
+          'vendor/scripts/jquery-ui-timepicker-addon.js',
+          'vendor/scripts/jquery.ui.slider.js',
+          'vendor/scripts/jquery.ui.sortable.js',
+          'vendor/scripts/jquery.ui.custom-effects.js',
+          'vendor/scripts/jquery.timeago.js',
+          'vendor/scripts/jquery.ajax-retry.js',
+          'vendor/scripts/jquery.sticky-kit.js',
+          'vendor/scripts/underscore.js',
+          'vendor/scripts/backbone.js',
+          'vendor/scripts/difflib.js',
+          'vendor/scripts/diffview.js',
+          'vendor/scripts/visualsearch.js',
+          'vendor/scripts/moment.min.js',
+          'vendor/scripts/moment-timezone-with-data-2010-2020.js',
+          'vendor/scripts/workflow_visualization.js',
+          'vendor/scripts/rickshaw.js',
+          'vendor/scripts/spin.js',
+          'vendor/scripts/jquery.flexibleArea.js',
+          'vendor/scripts/FileSaver.js',
+          'vendor/scripts/Blob.js'
+        ]
+      }
+    },
+    stylesheets: {
+      defaultExtension: 'css',
+      joinTo: {
+        'stylesheets/app.css': /^app/,
+        'stylesheets/vendor.css': /^vendor/
+      },
+      order: {
+        before: [
+          'vendor/styles/bootstrap.css',
+          'vendor/styles/font-awesome.css',
+          'vendor/styles/font-awesome-ie7.css',
+          'vendor/styles/cubism.css',
+          'vendor/styles/rickshaw.css',
+          'vendor/styles/bootstrap-combobox.css',
+          'vendor/styles/bootstrap-checkbox.css',
+          'vendor/styles/bootstrap-slider.min.css',
+          'vendor/styles/bootstrap-switch.min.css',
+          'vendor/styles/diffview.css',
+          'vendor/styles/visualsearch-datauri.css'
+        ],
+        after: ['app/styles/custom-ui.css']
+      }
+    },
+
+
+    templates: {
+      precompile: true,
+      defaultExtensions: ['hbs'],
+      joinTo: {'javascripts/app.js': /^app/},
+      paths: {
+        jquery: 'vendor/scripts/jquery-1.7.2.min.js',
+        handlebars: 'vendor/scripts/handlebars-1.0.0.beta.6.js',
+        ember: 'vendor/scripts/ember-latest.js'
+      }
+    }
+  },
+
+  server: {
+    port: 3333,
+    base: '/',
+    run: 'no'
+  },
+
+  sourceMaps: false
+};

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9bbf464/ambari-web/config.coffee
----------------------------------------------------------------------
diff --git a/ambari-web/config.coffee b/ambari-web/config.coffee
deleted file mode 100644
index 6a3f5ef..0000000
--- a/ambari-web/config.coffee
+++ /dev/null
@@ -1,112 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-fs   = require 'fs'
-path = require 'path'
-
-# See docs at http://brunch.readthedocs.org/en/latest/config.html.
-
-exports.config =
-
-  files:
-
-    javascripts:
-      joinTo:
-        'javascripts/app.js': /^app/
-        'javascripts/vendor.js': /^vendor/
-        'test/javascripts/test.js': /^test(\/|\\)(?!vendor)/
-        'test/javascripts/test-vendor.js': /^test(\/|\\)(?=vendor)/
-      order:
-        before: [
-          'vendor/scripts/console-helper.js',
-          'vendor/scripts/jquery-1.7.2.min.js',
-          'vendor/scripts/handlebars-1.0.0.beta.6.js',
-          'vendor/scripts/ember-latest.js',
-          'vendor/scripts/ember-data-latest.js',
-          'vendor/scripts/ember-i18n-1.4.1.js',
-          'vendor/scripts/bootstrap.js',
-          'vendor/scripts/bootstrap-combobox.js',
-          'vendor/scripts/bootstrap-checkbox.js',
-          'vendor/scripts/bootstrap-slider.min.js',
-          'vendor/scripts/bootstrap-switch.min.js',
-          'vendor/scripts/d3.v2.js',
-          'vendor/scripts/cubism.v1.js',
-          'vendor/scripts/jquery.ui.core.js',
-          'vendor/scripts/jquery.ui.position.js',
-          'vendor/scripts/jquery.ui.widget.js',
-          'vendor/scripts/jquery.ui.autocomplete.js',
-          'vendor/scripts/jquery.ui.mouse.js',
-          'vendor/scripts/jquery.ui.datepicker.js',
-          'vendor/scripts/jquery-ui-timepicker-addon.js',
-          'vendor/scripts/jquery.ui.slider.js',
-          'vendor/scripts/jquery.ui.sortable.js',
-          'vendor/scripts/jquery.ui.custom-effects.js',
-          'vendor/scripts/jquery.timeago.js',
-          'vendor/scripts/jquery.ajax-retry.js',
-          'vendor/scripts/jquery.sticky-kit.js',
-          'vendor/scripts/underscore.js',
-          'vendor/scripts/backbone.js',
-          'vendor/scripts/difflib.js',
-          'vendor/scripts/diffview.js',
-          'vendor/scripts/visualsearch.js',
-          'vendor/scripts/moment.min.js',
-          'vendor/scripts/moment-timezone-with-data-2010-2020.js',
-          'vendor/scripts/workflow_visualization.js',
-          'vendor/scripts/rickshaw.js',
-          'vendor/scripts/spin.js',
-          'vendor/scripts/jquery.flexibleArea.js',
-          'vendor/scripts/FileSaver.js',
-          'vendor/scripts/Blob.js'
-
-          ]
-
-    stylesheets:
-      defaultExtension: 'css'
-      joinTo:
-        'stylesheets/app.css': /^app/
-        'stylesheets/vendor.css': /^vendor/
-      order:
-        before: [
-          'vendor/styles/bootstrap.css',
-          'vendor/styles/font-awesome.css',
-          'vendor/styles/font-awesome-ie7.css',
-          'vendor/styles/cubism.css',
-          'vendor/styles/rickshaw.css',
-          'vendor/styles/bootstrap-combobox.css',
-          'vendor/styles/bootstrap-checkbox.css',
-          'vendor/styles/bootstrap-slider.min.css',
-          'vendor/styles/bootstrap-switch.min.css',
-          'vendor/styles/diffview.css',
-          'vendor/styles/visualsearch-datauri.css'
-        ],
-        after: ['app/styles/custom-ui.css']
-
-    templates:
-      precompile: true
-      defaultExtension: 'hbs'
-      joinTo: 'javascripts/app.js' : /^app/
-      paths:
-        jquery: 'vendor/scripts/jquery-1.7.2.min.js'
-        handlebars: 'vendor/scripts/handlebars-1.0.0.beta.6.js'
-        ember: 'vendor/scripts/ember-latest.js'
-
-  server:
-    port: 3333
-    base: '/'
-    run: no
-
-  sourceMaps: false

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9bbf464/ambari-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-web/package.json b/ambari-web/package.json
index 550d293..6702471 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -8,6 +8,7 @@
     "url": 
"https://git-wip-us.apache.org/repos/asf/ambari/repo?p=ambari.git;a=summary";
   },
   "dependencies": {
+    "babel-brunch": "^5.1.2",
     "javascript-brunch": ">= 1.0 < 1.5",
     "css-brunch": ">= 1.0 < 1.5",
     "uglify-js-brunch": ">= 1.0 < 1.5",

Reply via email to