Merge branch '38869-project' into 'master'

Export project, projectAvatar and projectImport as ES6 modules

See merge request gitlab-org/gitlab-ce!15355

app/assets/javascripts/dispatcher.js

@@ -20,15 +20,15 @@ import groupsSelect from './groups_select';
 import NamespaceSelect from './namespace_select';
 /* global NewCommitForm */
 /* global NewBranchForm */
-/* global Project */
-/* global ProjectAvatar */
+import Project from './project';
+import projectAvatar from './project_avatar';
 /* global MergeRequest */
 /* global Compare */
 /* global CompareAutocomplete */
 /* global ProjectFindFile */
 /* global ProjectNew */
 /* global ProjectShow */
-/* global ProjectImport */
+import projectImport from './project_import';
 import Labels from './labels';
 import LabelManager from './label_manager';
 /* global Sidebar */
@@ -378,7 +378,7 @@ import Diff from './diff';
           initSettingsPanels();
           break;
         case 'projects:imports:show':
-          new ProjectImport();
+          projectImport();
           break;
         case 'projects:pipelines:new':
           new NewBranchForm($('.js-new-pipeline-form'));
@@ -604,7 +604,7 @@ import Diff from './diff';
           break;
         case 'projects':
           new Project();
-          new ProjectAvatar();
+          projectAvatar();
           switch (path[1]) {
             case 'compare':
               new CompareAutocomplete();

app/assets/javascripts/main.js

@@ -69,8 +69,6 @@ import './notifications_dropdown';
 import './notifications_form';
 import './pager';
 import './preview_markdown';
-import './project';
-import './project_avatar';
 import './project_find_file';
 import './project_import';
 import './project_label_subscription';

app/assets/javascripts/project.js

-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
+/* eslint-disable func-names, space-before-function-paren, no-var, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
 /* global ProjectSelect */
 
 import Cookies from 'js-cookie';
 
-(function() {
-  this.Project = (function() {
-    function Project() {
+export default class Project {
+  constructor() {
     const $cloneOptions = $('ul.clone-options-dropdown');
     const $projectCloneField = $('#project_clone');
     const $cloneBtnText = $('a.clone-dropdown-btn span');
@@ -29,7 +28,7 @@ import Cookies from 'js-cookie';
       return $('.clone').text(url);
     });
     // Ref switcher
-      this.initRefSwitcher();
+    Project.initRefSwitcher();
     $('.project-refs-select').on('change', function() {
       return $(this).parents('form').submit();
     });
@@ -43,23 +42,19 @@ import Cookies from 'js-cookie';
       $(this).parents('.no-password-message').remove();
       return e.preventDefault();
     });
-      this.projectSelectDropdown();
+    Project.projectSelectDropdown();
   }
 
-    Project.prototype.projectSelectDropdown = function() {
+  static projectSelectDropdown () {
     new ProjectSelect();
-      $('.project-item-select').on('click', (function(_this) {
-        return function(e) {
-          return _this.changeProject($(e.currentTarget).val());
-        };
-      })(this));
-    };
-
-    Project.prototype.changeProject = function(url) {
+    $('.project-item-select').on('click', e => Project.changeProject($(e.currentTarget).val()));
+  }
+
+  static changeProject(url) {
     return window.location = url;
-    };
+  }
 
-    Project.prototype.initRefSwitcher = function() {
+  static initRefSwitcher() {
     var refListItem = document.createElement('li');
     var refLink = document.createElement('a');
 
@@ -75,9 +70,9 @@ import Cookies from 'js-cookie';
             url: $dropdown.data('refs-url'),
             data: {
               ref: $dropdown.data('ref'),
-                search: term
+              search: term,
             },
-              dataType: "json"
+            dataType: 'json',
           }).done(function(refs) {
             return callback(refs);
           });
@@ -129,11 +124,8 @@ import Cookies from 'js-cookie';
               gl.utils.visitUrl(`${action}${divider}${$form.serialize()}`);
             }
           }
-          }
+        },
       });
     });
-    };
-
-    return Project;
-  })();
-}).call(window);
+  }
+}

app/assets/javascripts/project_avatar.js

-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, one-var, one-var-declaration-per-line, no-useless-escape, max-len */
-(function() {
-  this.ProjectAvatar = (function() {
-    function ProjectAvatar() {
-      $('.js-choose-project-avatar-button').bind('click', function() {
-        var form;
-        form = $(this).closest('form');
+export default function projectAvatar() {
+  $('.js-choose-project-avatar-button').bind('click', function onClickAvatar() {
+    const form = $(this).closest('form');
     return form.find('.js-project-avatar-input').click();
   });
-      $('.js-project-avatar-input').bind('change', function() {
-        var filename, form;
-        form = $(this).closest('form');
-        filename = $(this).val().replace(/^.*[\\\/]/, '');
+
+  $('.js-project-avatar-input').bind('change', function onClickAvatarInput() {
+    const form = $(this).closest('form');
+    // eslint-disable-next-line no-useless-escape
+    const filename = $(this).val().replace(/^.*[\\\/]/, '');
     return form.find('.js-avatar-filename').text(filename);
   });
-    }
-
-    return ProjectAvatar;
-  })();
-}).call(window);
+}

app/assets/javascripts/project_import.js

-/* eslint-disable func-names, space-before-function-paren, wrap-iife, prefer-arrow-callback, max-len */
+import { visitUrl } from './lib/utils/url_utility';
 
-(function() {
-  this.ProjectImport = (function() {
-    function ProjectImport() {
-      setTimeout(function() {
-        return gl.utils.visitUrl(location.href);
+export default function projectImport() {
+  setTimeout(() => {
+    visitUrl(location.href);
   }, 5000);
-    }
+}
 
-    return ProjectImport;
-  })();
-}).call(window);