[08/21] ambari git commit: AMBARI-18180 Add ES6 support to Ambari Web. (ababiichuk)
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/branch-dev-patch-upgrade Commit: a9bbf4644890690c45e9879f7bda9ff9d0ec7000 Parents: f90b55a Author: ababiichukAuthored: Thu Aug 25 16:15:22 2016 +0300 Committer: ababiichuk 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: '' }); @@ -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 000..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', +
ambari git commit: AMBARI-18180 Add ES6 support to Ambari Web. (ababiichuk)
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: ababiichukAuthored: Thu Aug 25 16:15:22 2016 +0300 Committer: ababiichuk 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: '' }); @@ -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 000..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', +