diff options
Diffstat (limited to 'server/sonar-web/src/main/js/coding-rules')
31 files changed, 59 insertions, 131 deletions
diff --git a/server/sonar-web/src/main/js/coding-rules/app.js b/server/sonar-web/src/main/js/coding-rules/app.js index 4dfb34661a7..cbf845d6410 100644 --- a/server/sonar-web/src/main/js/coding-rules/app.js +++ b/server/sonar-web/src/main/js/coding-rules/app.js @@ -1,31 +1,9 @@ requirejs.config({ - baseUrl: baseUrl + '/js', - - paths: { - 'backbone': 'third-party/backbone', - 'backbone.marionette': 'third-party/backbone.marionette', - 'handlebars': 'third-party/handlebars' - }, - - shim: { - 'backbone.marionette': { - deps: ['backbone'], - exports: 'Marionette' - }, - 'backbone': { - exports: 'Backbone' - }, - 'handlebars': { - exports: 'Handlebars' - } - } + baseUrl: baseUrl + '/js' }); requirejs([ - 'backbone', - 'backbone.marionette', - 'coding-rules/models/state', 'coding-rules/layout', 'coding-rules/models/rules', @@ -38,13 +16,9 @@ requirejs([ 'coding-rules//workspace-header-view', 'coding-rules/facets-view', - 'coding-rules/filters-view', - - 'common/handlebars-extensions' + 'coding-rules/filters-view' ], - function (Backbone, - Marionette, - State, + function (State, Layout, Rules, Facets, diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js index 3067968349b..ddf8c97c525 100644 --- a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js +++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js @@ -1,7 +1,7 @@ define([ 'common/modal-form', 'templates/coding-rules' -], function (ModalFormView, Templates) { +], function (ModalFormView) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js index e373bd04da6..a8eb0b8fb96 100644 --- a/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js +++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js @@ -1,8 +1,8 @@ define([ 'common/popup', - 'templates/coding-rules', - 'coding-rules/bulk-change-modal-view' -], function (PopupView, Templates, BulkChangeModalView) { + 'coding-rules/bulk-change-modal-view', + 'templates/coding-rules' +], function (PopupView, BulkChangeModalView) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js index f6ec4dd731b..bd95f6519f7 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { return BaseFacet.extend({ template: Templates['coding-rules-severity-facet'], diff --git a/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js index d98f5528896..573ca2abd0b 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { return BaseFacet.extend({ template: Templates['coding-rules-available-since-facet'], diff --git a/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js index b757662d197..cddf9d99129 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js @@ -1,7 +1,7 @@ define([ 'components/navigator/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { return BaseFacet.extend({ className: 'search-navigator-facet-box', diff --git a/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js index 3c434fba6fe..778a044590d 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js index 876cbe61d40..02fc32ac368 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { return BaseFacet.extend({ template: Templates['coding-rules-query-facet'], diff --git a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js index 133cc18c3a6..219a5e67c85 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { return BaseFacet.extend({ template: Templates['coding-rules-severity-facet'], diff --git a/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js index 783a6c6bb89..81a031da126 100644 --- a/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js +++ b/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js @@ -1,7 +1,7 @@ define([ 'coding-rules/facets/base-facet', 'templates/coding-rules' -], function (BaseFacet, Templates) { +], function (BaseFacet) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/filters-view.js b/server/sonar-web/src/main/js/coding-rules/filters-view.js index d46f4f68e12..451790ea2b6 100644 --- a/server/sonar-web/src/main/js/coding-rules/filters-view.js +++ b/server/sonar-web/src/main/js/coding-rules/filters-view.js @@ -1,8 +1,7 @@ define([ - 'backbone.marionette', - 'templates/coding-rules', - 'coding-rules/rule/manual-rule-creation-view' -], function (Marionette, Templates, ManualRuleCreationView) { + 'coding-rules/rule/manual-rule-creation-view', + 'templates/coding-rules' +], function (ManualRuleCreationView) { return Marionette.ItemView.extend({ template: Templates['coding-rules-filters'], diff --git a/server/sonar-web/src/main/js/coding-rules/layout.js b/server/sonar-web/src/main/js/coding-rules/layout.js index f6386fa375a..412b832f9b9 100644 --- a/server/sonar-web/src/main/js/coding-rules/layout.js +++ b/server/sonar-web/src/main/js/coding-rules/layout.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/models/rule.js b/server/sonar-web/src/main/js/coding-rules/models/rule.js index edfd042fe0a..14f4b9b1f56 100644 --- a/server/sonar-web/src/main/js/coding-rules/models/rule.js +++ b/server/sonar-web/src/main/js/coding-rules/models/rule.js @@ -1,6 +1,4 @@ -define([ - 'backbone' -], function (Backbone) { +define(function () { return Backbone.Model.extend({ idAttribute: 'key', diff --git a/server/sonar-web/src/main/js/coding-rules/models/rules.js b/server/sonar-web/src/main/js/coding-rules/models/rules.js index 12c8aadb0e3..d0cc24411e6 100644 --- a/server/sonar-web/src/main/js/coding-rules/models/rules.js +++ b/server/sonar-web/src/main/js/coding-rules/models/rules.js @@ -1,7 +1,6 @@ define([ - 'backbone', 'coding-rules/models/rule' -], function (Backbone, Rule) { +], function (Rule) { return Backbone.Collection.extend({ model: Rule, diff --git a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js index 5ae027f524b..95475fe7b5a 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js @@ -1,20 +1,15 @@ define([ - 'backbone', - 'backbone.marionette', - 'templates/coding-rules', - 'coding-rules/models/rules', - 'coding-rules/rule/rule-meta-view', - 'coding-rules/rule/rule-description-view', - 'coding-rules/rule/rule-parameters-view', - 'coding-rules/rule/rule-profiles-view', - 'coding-rules/rule/custom-rules-view', - 'coding-rules/rule/manual-rule-creation-view', - 'coding-rules/rule/rule-issues-view' -], - function (Backbone, - Marionette, - Templates, - Rules, + 'coding-rules/models/rules', + 'coding-rules/rule/rule-meta-view', + 'coding-rules/rule/rule-description-view', + 'coding-rules/rule/rule-parameters-view', + 'coding-rules/rule/rule-profiles-view', + 'coding-rules/rule/custom-rules-view', + 'coding-rules/rule/manual-rule-creation-view', + 'coding-rules/rule/rule-issues-view', + 'templates/coding-rules' + ], + function (Rules, MetaView, DescView, ParamView, diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js index ccab3a0d7b9..efa3a520e14 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js @@ -1,7 +1,7 @@ define([ 'common/modal-form', 'templates/coding-rules' -], function (ModalFormView, Templates) { +], function (ModalFormView) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js index cb96f91c5c9..346823ad9af 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js index ea519ab4b51..1517464defb 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js @@ -1,9 +1,8 @@ define([ - 'backbone.marionette', - 'templates/coding-rules', 'coding-rules/rule/custom-rule-view', - 'coding-rules/rule/custom-rule-creation-view' -], function (Marionette, Templates, CustomRuleView, CustomRuleCreationView) { + 'coding-rules/rule/custom-rule-creation-view', + 'templates/coding-rules' +], function (CustomRuleView, CustomRuleCreationView) { return Marionette.CompositeView.extend({ template: Templates['coding-rules-custom-rules'], diff --git a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js index 53f58f0b2aa..0bd198dafac 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js @@ -1,7 +1,7 @@ define([ 'common/modal-form', 'templates/coding-rules' -], function (ModalFormView, Templates) { +], function (ModalFormView) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js index b34b4d83125..a9c0bee72d0 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js @@ -1,7 +1,7 @@ define([ 'common/modals', 'templates/coding-rules' -], function (Modal, Templates) { +], function (Modal) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js index dfbe5e156d4..979f43e1afc 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { return Marionette.ItemView.extend({ template: Templates['coding-rules-rule-description'], diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js index 31daddd1892..4a0643471c7 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js index f1558079700..61f82bc09c6 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { return Marionette.ItemView.extend({ template: Templates['coding-rules-rule-meta'], diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js index f2572460033..ad7820b8e8d 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js @@ -1,7 +1,6 @@ define([ - 'backbone.marionette', 'templates/coding-rules' -], function (Marionette, Templates) { +], function () { return Marionette.ItemView.extend({ template: Templates['coding-rules-rule-parameters'], diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js index 5a9d29b731a..5625796913d 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js @@ -1,8 +1,7 @@ define([ - 'backbone.marionette', - 'templates/coding-rules', - 'coding-rules/rule/profile-activation-view' -], function (Marionette, Templates, ProfileActivationView) { + 'coding-rules/rule/profile-activation-view', + 'templates/coding-rules' +], function (ProfileActivationView) { return Marionette.ItemView.extend({ tagName: 'tr', diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js index 5a7be4748e0..bead27c9bed 100644 --- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js +++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js @@ -1,9 +1,8 @@ define([ - 'backbone.marionette', - 'templates/coding-rules', 'coding-rules/rule/rule-profile-view', - 'coding-rules/rule/profile-activation-view' -], function (Marionette, Templates, ProfileView, ProfileActivationView) { + 'coding-rules/rule/profile-activation-view', + 'templates/coding-rules' +], function (ProfileView, ProfileActivationView) { return Marionette.CompositeView.extend({ template: Templates['coding-rules-rule-profiles'], diff --git a/server/sonar-web/src/main/js/coding-rules/show-app.js b/server/sonar-web/src/main/js/coding-rules/show-app.js index ee68beb0df4..3e815a93f26 100644 --- a/server/sonar-web/src/main/js/coding-rules/show-app.js +++ b/server/sonar-web/src/main/js/coding-rules/show-app.js @@ -1,39 +1,13 @@ requirejs.config({ - baseUrl: baseUrl + '/js', - - paths: { - 'backbone': 'third-party/backbone', - 'backbone.marionette': 'third-party/backbone.marionette', - 'handlebars': 'third-party/handlebars' - }, - - shim: { - 'backbone.marionette': { - deps: ['backbone'], - exports: 'Marionette' - }, - 'backbone': { - exports: 'Backbone' - }, - 'handlebars': { - exports: 'Handlebars' - } - } + baseUrl: baseUrl + '/js' }); requirejs([ - 'backbone', - 'backbone.marionette', - 'coding-rules/models/rule', - 'coding-rules/rule-details-view', - - 'common/handlebars-extensions' + 'coding-rules/rule-details-view' ], - function (Backbone, - Marionette, - Rule, + function (Rule, RuleDetailsView) { var $ = jQuery, diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js index ef19ef289a9..cbcebe2db72 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js @@ -1,8 +1,8 @@ define([ 'components/navigator/workspace-header-view', - 'templates/coding-rules', - 'coding-rules/bulk-change-popup-view' -], function (WorkspaceHeaderView, Templates, BulkChangePopup) { + 'coding-rules/bulk-change-popup-view', + 'templates/coding-rules' +], function (WorkspaceHeaderView, BulkChangePopup) { var $ = jQuery; diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js index cbb103547d2..da182d39095 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js @@ -1,6 +1,4 @@ -define([ - 'backbone.marionette' -], function (Marionette) { +define(function () { return Marionette.ItemView.extend({ className: 'search-navigator-no-results', diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js index c2827277d4b..f7cd1120f15 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js @@ -1,7 +1,7 @@ define([ 'components/navigator/workspace-list-item-view', 'templates/coding-rules' -], function (WorkspaceListItemView, Templates) { +], function (WorkspaceListItemView) { return WorkspaceListItemView.extend({ className: 'coding-rule', diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js index 605e60f942e..f1da56fb627 100644 --- a/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js +++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js @@ -1,9 +1,9 @@ define([ 'components/navigator/workspace-list-view', - 'templates/coding-rules', 'coding-rules/workspace-list-item-view', - 'coding-rules/workspace-list-empty-view' -], function (WorkspaceListView, Templates, WorkspaceListItemView, WorkspaceListEmptyView) { + 'coding-rules/workspace-list-empty-view', + 'templates/coding-rules' +], function (WorkspaceListView, WorkspaceListItemView, WorkspaceListEmptyView) { var $ = jQuery; |