Prettify blob behaviors and cycle_analytics modules

13 files changed, 79 insertions, 122 deletions

diff --git a/app/assets/javascripts/blob/3d_viewer/index.js b/app/assets/javascripts/blob/3d_viewer/index.js
index 1bdf1aeb76c..2d4f45cc365 100644
--- a/app/assets/javascripts/blob/3d_viewer/index.js
+++ b/app/assets/javascripts/blob/3d_viewer/index.js
@@ -18,12 +18,7 @@ export default class Renderer {
     this.loader = new STLLoader();
 
     this.fov = 45;
-    this.camera = new THREE.PerspectiveCamera(
-      this.fov,
-      this.width / this.height,
-      1,
-      1000,
-    );
+    this.camera = new THREE.PerspectiveCamera(this.fov, this.width / this.height, 1, 1000);
 
     this.scene = new THREE.Scene();
 
@@ -35,10 +30,7 @@ export default class Renderer {
     this.setupLight();
 
     // Set up OrbitControls
-    this.controls = new OrbitControls(
-      this.camera,
-      this.renderer.domElement,
-    );
+    this.controls = new OrbitControls(this.camera, this.renderer.domElement);
     this.controls.minDistance = 5;
     this.controls.maxDistance = 30;
     this.controls.enableKeys = false;
@@ -51,47 +43,32 @@ export default class Renderer {
       antialias: true,
     });
 
-    this.renderer.setClearColor(0xFFFFFF);
+    this.renderer.setClearColor(0xffffff);
     this.renderer.setPixelRatio(window.devicePixelRatio);
-    this.renderer.setSize(
-      this.width,
-      this.height,
-    );
+    this.renderer.setSize(this.width, this.height);
   }
 
   setupLight() {
     // Point light illuminates the object
-    const pointLight = new THREE.PointLight(
-      0xFFFFFF,
-      2,
-      0,
-    );
+    const pointLight = new THREE.PointLight(0xffffff, 2, 0);
 
     pointLight.castShadow = true;
 
     this.camera.add(pointLight);
 
     // Ambient light illuminates the scene
-    const ambientLight = new THREE.AmbientLight(
-      0xFFFFFF,
-      1,
-    );
+    const ambientLight = new THREE.AmbientLight(0xffffff, 1);
     this.scene.add(ambientLight);
   }
 
   setupGrid() {
-    this.grid = new THREE.GridHelper(
-      20,
-      20,
-      0x000000,
-      0x000000,
-    );
+    this.grid = new THREE.GridHelper(20, 20, 0x000000, 0x000000);
 
     this.scene.add(this.grid);
   }
 
   loadFile() {
-    this.loader.load(this.container.dataset.endpoint, (geo) => {
+    this.loader.load(this.container.dataset.endpoint, geo => {
       const obj = new MeshObject(geo);
 
       this.objects.push(obj);
@@ -116,30 +93,23 @@ export default class Renderer {
   }
 
   render() {
-    this.renderer.render(
-      this.scene,
-      this.camera,
-    );
+    this.renderer.render(this.scene, this.camera);
 
     requestAnimationFrame(this.renderWrapper);
   }
 
   changeObjectMaterials(type) {
-    this.objects.forEach((obj) => {
+    this.objects.forEach(obj => {
       obj.changeMaterial(type);
     });
   }
 
   setDefaultCameraPosition() {
     const obj = this.objects[0];
-    const radius = (obj.geometry.boundingSphere.radius / 1.5);
-    const dist = radius / (Math.sin((this.fov * (Math.PI / 180)) / 2));
-
-    this.camera.position.set(
-      0,
-      dist + 1,
-      dist,
-    );
+    const radius = obj.geometry.boundingSphere.radius / 1.5;
+    const dist = radius / Math.sin((this.fov * (Math.PI / 180)) / 2);
+
+    this.camera.position.set(0, dist + 1, dist);
 
     this.camera.lookAt(this.grid);
     this.controls.update();
diff --git a/app/assets/javascripts/blob/3d_viewer/mesh_object.js b/app/assets/javascripts/blob/3d_viewer/mesh_object.js
index 96758884abf..cb7fcff8674 100644
--- a/app/assets/javascripts/blob/3d_viewer/mesh_object.js
+++ b/app/assets/javascripts/blob/3d_viewer/mesh_object.js
@@ -1,10 +1,6 @@
-import {
-  Matrix4,
-  MeshLambertMaterial,
-  Mesh,
-} from 'three/build/three.module';
+import { Matrix4, MeshLambertMaterial, Mesh } from 'three/build/three.module';
 
-const defaultColor = 0xE24329;
+const defaultColor = 0xe24329;
 const materials = {
   default: new MeshLambertMaterial({
     color: defaultColor,
@@ -17,10 +13,7 @@ const materials = {
 
 export default class MeshObject extends Mesh {
   constructor(geo) {
-    super(
-      geo,
-      materials.default,
-    );
+    super(geo, materials.default);
 
     this.geometry.computeBoundingSphere();
 
@@ -29,13 +22,7 @@ export default class MeshObject extends Mesh {
     if (this.geometry.boundingSphere.radius > 4) {
       const scale = 4 / this.geometry.boundingSphere.radius;
 
-      this.geometry.applyMatrix(
-        new Matrix4().makeScale(
-          scale,
-          scale,
-          scale,
-        ),
-      );
+      this.geometry.applyMatrix(new Matrix4().makeScale(scale, scale, scale));
       this.geometry.computeBoundingSphere();
 
       this.position.x = -this.geometry.boundingSphere.center.x;
diff --git a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
index 7986287f7e7..75777b910ca 100644
--- a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
+++ b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
@@ -42,7 +42,7 @@ class BalsamiqViewer {
     this.initDatabase(loadEvent.target.response);
 
     const previews = this.getPreviews();
-    previews.forEach((preview) => {
+    previews.forEach(preview => {
       const renderedPreview = this.renderPreview(preview);
 
       container.appendChild(renderedPreview);
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js
index ff1739b1679..cd3251ad1ca 100644
--- a/app/assets/javascripts/blob/blob_file_dropzone.js
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
@@ -41,39 +41,45 @@ export default class BlobFileDropzone {
       addRemoveLinks: true,
       previewsContainer: '.dropzone-previews',
       headers: csrf.headers,
-      init: function () {
-        this.on('addedfile', function () {
+      init: function() {
+        this.on('addedfile', function() {
           toggleLoading(submitButton, submitButtonLoadingIcon, false);
           dropzoneMessage.addClass(HIDDEN_CLASS);
-          $('.dropzone-alerts').html('').hide();
+          $('.dropzone-alerts')
+            .html('')
+            .hide();
         });
-        this.on('removedfile', function () {
+        this.on('removedfile', function() {
           toggleLoading(submitButton, submitButtonLoadingIcon, false);
           dropzoneMessage.removeClass(HIDDEN_CLASS);
         });
-        this.on('success', function (header, response) {
+        this.on('success', function(header, response) {
           $('#modal-upload-blob').modal('hide');
           visitUrl(response.filePath);
         });
-        this.on('maxfilesexceeded', function (file) {
+        this.on('maxfilesexceeded', function(file) {
           dropzoneMessage.addClass(HIDDEN_CLASS);
           this.removeFile(file);
         });
-        this.on('sending', function (file, xhr, formData) {
+        this.on('sending', function(file, xhr, formData) {
           formData.append('branch_name', form.find('.js-branch-name').val());
           formData.append('create_merge_request', form.find('.js-create-merge-request').val());
           formData.append('commit_message', form.find('.js-commit-message').val());
         });
       },
       // Override behavior of adding error underneath preview
-      error: function (file, errorMessage) {
-        const stripped = $('<div/>').html(errorMessage).text();
-        $('.dropzone-alerts').html(`Error uploading file: "${stripped}"`).show();
+      error: function(file, errorMessage) {
+        const stripped = $('<div/>')
+          .html(errorMessage)
+          .text();
+        $('.dropzone-alerts')
+          .html(`Error uploading file: "${stripped}"`)
+          .show();
         this.removeFile(file);
       },
     });
 
-    submitButton.on('click', (e) => {
+    submitButton.on('click', e => {
       e.preventDefault();
       e.stopPropagation();
       if (dropzone[0].dropzone.getQueuedFiles().length === 0) {
diff --git a/app/assets/javascripts/blob/blob_line_permalink_updater.js b/app/assets/javascripts/blob/blob_line_permalink_updater.js
index d36d9f0de2d..62f0a56ed75 100644
--- a/app/assets/javascripts/blob/blob_line_permalink_updater.js
+++ b/app/assets/javascripts/blob/blob_line_permalink_updater.js
@@ -2,17 +2,19 @@ import { getLocationHash } from '../lib/utils/url_utility';
 
 const lineNumberRe = /^L[0-9]+/;
 
-const updateLineNumbersOnBlobPermalinks = (linksToUpdate) => {
+const updateLineNumbersOnBlobPermalinks = linksToUpdate => {
   const hash = getLocationHash();
   if (hash && lineNumberRe.test(hash)) {
     const hashUrlString = `#${hash}`;
 
-    [].concat(Array.prototype.slice.call(linksToUpdate)).forEach((permalinkButton) => {
-      const baseHref = permalinkButton.getAttribute('data-original-href') || (() => {
-        const href = permalinkButton.getAttribute('href');
-        permalinkButton.setAttribute('data-original-href', href);
-        return href;
-      })();
+    [].concat(Array.prototype.slice.call(linksToUpdate)).forEach(permalinkButton => {
+      const baseHref =
+        permalinkButton.getAttribute('data-original-href') ||
+        (() => {
+          const href = permalinkButton.getAttribute('href');
+          permalinkButton.setAttribute('data-original-href', href);
+          return href;
+        })();
       permalinkButton.setAttribute('href', `${baseHref}${hashUrlString}`);
     });
   }
@@ -26,7 +28,7 @@ function BlobLinePermalinkUpdater(blobContentHolder, lineNumberSelector, element
     }, 0);
   };
 
-  blobContentHolder.addEventListener('click', (e) => {
+  blobContentHolder.addEventListener('click', e => {
     if (e.target.matches(lineNumberSelector)) {
       updateBlameAndBlobPermalinkCb();
     }
diff --git a/app/assets/javascripts/blob/file_template_selector.js b/app/assets/javascripts/blob/file_template_selector.js
index 02228434a29..476901aae75 100644
--- a/app/assets/javascripts/blob/file_template_selector.js
+++ b/app/assets/javascripts/blob/file_template_selector.js
@@ -45,15 +45,11 @@ export default class FileTemplateSelector {
   }
 
   renderLoading() {
-    this.$loadingIcon
-      .addClass('fa-spinner fa-spin')
-      .removeClass('fa-chevron-down');
+    this.$loadingIcon.addClass('fa-spinner fa-spin').removeClass('fa-chevron-down');
   }
 
   renderLoaded() {
-    this.$loadingIcon
-      .addClass('fa-chevron-down')
-      .removeClass('fa-spinner fa-spin');
+    this.$loadingIcon.addClass('fa-chevron-down').removeClass('fa-spinner fa-spin');
   }
 
   reportSelection(options) {
diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js
index 6f1350e80fc..071022a9a75 100644
--- a/app/assets/javascripts/blob/notebook/index.js
+++ b/app/assets/javascripts/blob/notebook/index.js
@@ -40,13 +40,14 @@ export default () => {
     },
     methods: {
       loadFile() {
-        axios.get(el.dataset.endpoint)
+        axios
+          .get(el.dataset.endpoint)
           .then(res => res.data)
-          .then((data) => {
+          .then(data => {
             this.json = data;
             this.loading = false;
           })
-          .catch((e) => {
+          .catch(e => {
             if (e.status !== 200) {
               this.loadError = true;
             }
diff --git a/app/assets/javascripts/blob/sketch/index.js b/app/assets/javascripts/blob/sketch/index.js
index 13318c58006..57c1baa9886 100644
--- a/app/assets/javascripts/blob/sketch/index.js
+++ b/app/assets/javascripts/blob/sketch/index.js
@@ -13,7 +13,7 @@ export default class SketchLoader {
     return this.getZipFile()
       .then(data => JSZip.loadAsync(data))
       .then(asyncResult => asyncResult.files['previews/preview.png'].async('uint8array'))
-      .then((content) => {
+      .then(content => {
         const url = window.URL || window.webkitURL;
         const blob = new Blob([new Uint8Array(content)], {
           type: 'image/png',
diff --git a/app/assets/javascripts/blob/stl_viewer.js b/app/assets/javascripts/blob/stl_viewer.js
index 339906adc34..f129b6e631e 100644
--- a/app/assets/javascripts/blob/stl_viewer.js
+++ b/app/assets/javascripts/blob/stl_viewer.js
@@ -3,8 +3,8 @@ import Renderer from './3d_viewer';
 export default () => {
   const viewer = new Renderer(document.getElementById('js-stl-viewer'));
 
-  [].slice.call(document.querySelectorAll('.js-material-changer')).forEach((el) => {
-    el.addEventListener('click', (e) => {
+  [].slice.call(document.querySelectorAll('.js-material-changer')).forEach(el => {
+    el.addEventListener('click', e => {
       const { target } = e;
 
       e.preventDefault();
diff --git a/app/assets/javascripts/blob/template_selector.js b/app/assets/javascripts/blob/template_selector.js
index 9db1fa70ffb..37e348d93d3 100644
--- a/app/assets/javascripts/blob/template_selector.js
+++ b/app/assets/javascripts/blob/template_selector.js
@@ -81,14 +81,10 @@ export default class TemplateSelector {
   }
 
   startLoadingSpinner() {
-    this.$dropdownIcon
-      .addClass('fa-spinner fa-spin')
-      .removeClass('fa-chevron-down');
+    this.$dropdownIcon.addClass('fa-spinner fa-spin').removeClass('fa-chevron-down');
   }
 
   stopLoadingSpinner() {
-    this.$dropdownIcon
-      .addClass('fa-chevron-down')
-      .removeClass('fa-spinner fa-spin');
+    this.$dropdownIcon.addClass('fa-chevron-down').removeClass('fa-spinner fa-spin');
   }
 }
diff --git a/app/assets/javascripts/blob/template_selectors/license_selector.js b/app/assets/javascripts/blob/template_selectors/license_selector.js
index ac1fe95eee5..d01ab9257d6 100644
--- a/app/assets/javascripts/blob/template_selectors/license_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/license_selector.js
@@ -22,7 +22,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector {
       search: {
         fields: ['name'],
       },
-      clicked: (options) => {
+      clicked: options => {
         const { e } = options;
         const el = options.$el;
         const query = options.selectedObj;
diff --git a/app/assets/javascripts/blob/template_selectors/type_selector.js b/app/assets/javascripts/blob/template_selectors/type_selector.js
index a09381014a7..db3c144cbe3 100644
--- a/app/assets/javascripts/blob/template_selectors/type_selector.js
+++ b/app/assets/javascripts/blob/template_selectors/type_selector.js
@@ -21,5 +21,4 @@ export default class FileTemplateTypeSelector extends FileTemplateSelector {
       text: item => item.name,
     });
   }
-
 }
diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js
index 5485248cfaf..befa1dc455f 100644
--- a/app/assets/javascripts/blob/viewer/index.js
+++ b/app/assets/javascripts/blob/viewer/index.js
@@ -22,9 +22,8 @@ export default class BlobViewer {
     const viewer = document.querySelector('.blob-viewer[data-type="rich"]');
     if (!viewer || !viewer.dataset.richType) return;
 
-    const initViewer = promise => promise
-      .then(module => module.default(viewer))
-      .catch((error) => {
+    const initViewer = promise =>
+      promise.then(module => module.default(viewer)).catch(error => {
         Flash('Error loading file viewer.');
         throw error;
       });
@@ -79,10 +78,9 @@ export default class BlobViewer {
 
   initBindings() {
     if (this.switcherBtns.length) {
-      Array.from(this.switcherBtns)
-        .forEach((el) => {
-          el.addEventListener('click', this.switchViewHandler.bind(this));
-        });
+      Array.from(this.switcherBtns).forEach(el => {
+        el.addEventListener('click', this.switchViewHandler.bind(this));
+      });
     }
 
     if (this.copySourceBtn) {
@@ -109,7 +107,10 @@ export default class BlobViewer {
       this.copySourceBtn.setAttribute('title', 'Copy source to clipboard');
       this.copySourceBtn.classList.remove('disabled');
     } else if (this.activeViewer === this.simpleViewer) {
-      this.copySourceBtn.setAttribute('title', 'Wait for the source to load to copy it to the clipboard');
+      this.copySourceBtn.setAttribute(
+        'title',
+        'Wait for the source to load to copy it to the clipboard',
+      );
       this.copySourceBtn.classList.add('disabled');
     } else {
       this.copySourceBtn.setAttribute('title', 'Switch to the source to copy it to the clipboard');
@@ -147,15 +148,15 @@ export default class BlobViewer {
     this.toggleCopyButtonState();
 
     BlobViewer.loadViewer(newViewer)
-    .then((viewer) => {
-      $(viewer).renderGFM();
+      .then(viewer => {
+        $(viewer).renderGFM();
 
-      this.$fileHolder.trigger('highlight:line');
-      handleLocationHash();
+        this.$fileHolder.trigger('highlight:line');
+        handleLocationHash();
 
-      this.toggleCopyButtonState();
-    })
-    .catch(() => new Flash('Error loading viewer'));
+        this.toggleCopyButtonState();
+      })
+      .catch(() => new Flash('Error loading viewer'));
   }
 
   static loadViewer(viewerParam) {
@@ -168,12 +169,11 @@ export default class BlobViewer {
 
     viewer.setAttribute('data-loading', 'true');
 
-    return axios.get(url)
-      .then(({ data }) => {
-        viewer.innerHTML = data.html;
-        viewer.setAttribute('data-loaded', 'true');
+    return axios.get(url).then(({ data }) => {
+      viewer.innerHTML = data.html;
+      viewer.setAttribute('data-loaded', 'true');
 
-        return viewer;
-      });
+      return viewer;
+    });
   }
 }