diff options
Diffstat (limited to 'app/assets/javascripts/blob')
17 files changed, 30 insertions, 27 deletions
diff --git a/app/assets/javascripts/blob/3d_viewer/index.js b/app/assets/javascripts/blob/3d_viewer/index.js index 94397d70384..fd064e7ca8f 100644 --- a/app/assets/javascripts/blob/3d_viewer/index.js +++ b/app/assets/javascripts/blob/3d_viewer/index.js @@ -1,6 +1,6 @@ -import * as THREE from 'three/build/three.module'; -import STLLoaderClass from 'three-stl-loader'; import OrbitControlsClass from 'three-orbit-controls'; +import STLLoaderClass from 'three-stl-loader'; +import * as THREE from 'three/build/three.module'; import MeshObject from './mesh_object'; const STLLoader = STLLoaderClass(THREE); diff --git a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js index ebe2c2b3bb8..313bec7e01a 100644 --- a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js +++ b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js @@ -1,5 +1,5 @@ -import sqljs from 'sql.js'; import { template as _template } from 'lodash'; +import sqljs from 'sql.js'; import axios from '~/lib/utils/axios_utils'; import { successCodes } from '~/lib/utils/http_status'; diff --git a/app/assets/javascripts/blob/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq_viewer.js index fc86f630c4e..c9152db509a 100644 --- a/app/assets/javascripts/blob/balsamiq_viewer.js +++ b/app/assets/javascripts/blob/balsamiq_viewer.js @@ -1,6 +1,6 @@ +import { __ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '../flash'; import BalsamiqViewer from './balsamiq/balsamiq_viewer'; -import { __ } from '~/locale'; function onError() { const flash = new Flash(__('Balsamiq file could not be loaded.')); diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js index 19bad64155d..e72c5c90986 100644 --- a/app/assets/javascripts/blob/blob_file_dropzone.js +++ b/app/assets/javascripts/blob/blob_file_dropzone.js @@ -1,11 +1,11 @@ /* eslint-disable func-names */ -import $ from 'jquery'; import Dropzone from 'dropzone'; -import { visitUrl } from '../lib/utils/url_utility'; +import $ from 'jquery'; +import { sprintf, __ } from '~/locale'; import { HIDDEN_CLASS } from '../lib/utils/constants'; import csrf from '../lib/utils/csrf'; -import { sprintf, __ } from '~/locale'; +import { visitUrl } from '../lib/utils/url_utility'; Dropzone.autoDiscover = false; diff --git a/app/assets/javascripts/blob/components/blob_header.vue b/app/assets/javascripts/blob/components/blob_header.vue index a4a43b7a94e..9c023235428 100644 --- a/app/assets/javascripts/blob/components/blob_header.vue +++ b/app/assets/javascripts/blob/components/blob_header.vue @@ -1,7 +1,7 @@ <script> -import ViewerSwitcher from './blob_header_viewer_switcher.vue'; import DefaultActions from './blob_header_default_actions.vue'; import BlobFilepath from './blob_header_filepath.vue'; +import ViewerSwitcher from './blob_header_viewer_switcher.vue'; import { SIMPLE_BLOB_VIEWER } from './constants'; export default { @@ -71,7 +71,7 @@ export default { </template> </blob-filepath> - <div class="gl-display-none gl-display-sm-flex"> + <div class="gl-display-none gl-sm-display-flex"> <viewer-switcher v-if="showViewerSwitcher" v-model="viewer" /> <slot name="actions"></slot> diff --git a/app/assets/javascripts/blob/components/blob_header_filepath.vue b/app/assets/javascripts/blob/components/blob_header_filepath.vue index eb8068a8ad7..99fe3938046 100644 --- a/app/assets/javascripts/blob/components/blob_header_filepath.vue +++ b/app/assets/javascripts/blob/components/blob_header_filepath.vue @@ -1,7 +1,7 @@ <script> -import FileIcon from '~/vue_shared/components/file_icon.vue'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; export default { components: { diff --git a/app/assets/javascripts/blob/components/constants.js b/app/assets/javascripts/blob/components/constants.js index 0137bd38d28..a129c537fa5 100644 --- a/app/assets/javascripts/blob/components/constants.js +++ b/app/assets/javascripts/blob/components/constants.js @@ -1,5 +1,5 @@ -import { __, sprintf } from '~/locale'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import { __, sprintf } from '~/locale'; export const BTN_COPY_CONTENTS_TITLE = __('Copy file contents'); export const BTN_RAW_TITLE = __('Open raw'); diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index c35f9934004..77910850908 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -1,19 +1,19 @@ import $ from 'jquery'; import Api from '~/api'; -import toast from '~/vue_shared/plugins/global_toast'; -import { __ } from '~/locale'; import initPopover from '~/blob/suggest_gitlab_ci_yml'; +import { __ } from '~/locale'; +import toast from '~/vue_shared/plugins/global_toast'; import { deprecatedCreateFlash as Flash } from '../flash'; -import FileTemplateTypeSelector from './template_selectors/type_selector'; -import BlobCiYamlSelector from './template_selectors/ci_yaml_selector'; import BlobCiSyntaxYamlSelector from './template_selectors/ci_syntax_yaml_selector'; +import BlobCiYamlSelector from './template_selectors/ci_yaml_selector'; import DockerfileSelector from './template_selectors/dockerfile_selector'; import GitignoreSelector from './template_selectors/gitignore_selector'; import LicenseSelector from './template_selectors/license_selector'; import MetricsDashboardSelector from './template_selectors/metrics_dashboard_selector'; +import FileTemplateTypeSelector from './template_selectors/type_selector'; export default class FileTemplateMediator { constructor({ editor, currentAction, projectId }) { diff --git a/app/assets/javascripts/blob/file_template_selector.js b/app/assets/javascripts/blob/file_template_selector.js index 2532aeea989..a5c8050b772 100644 --- a/app/assets/javascripts/blob/file_template_selector.js +++ b/app/assets/javascripts/blob/file_template_selector.js @@ -66,6 +66,8 @@ export default class FileTemplateSelector { reportSelectionName(options) { const opts = options; opts.query = options.selectedObj.name; + opts.data = options.selectedObj; + opts.data.source_template_project_id = options.selectedObj.project_id; this.reportSelection(opts); } diff --git a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js b/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js index 9370e170571..c30ff4f1290 100644 --- a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js +++ b/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class BlobCiSyntaxYamlSelector extends FileTemplateSelector { constructor({ mediator }) { diff --git a/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js b/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js index 3879a6c5742..0cdfd153675 100644 --- a/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js +++ b/app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class BlobCiYamlSelector extends FileTemplateSelector { constructor({ mediator }) { diff --git a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js index 5d976c5acdb..b48b3d6bec3 100644 --- a/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js +++ b/app/assets/javascripts/blob/template_selectors/dockerfile_selector.js @@ -1,6 +1,6 @@ -import FileTemplateSelector from '../file_template_selector'; -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; +import FileTemplateSelector from '../file_template_selector'; export default class DockerfileSelector extends FileTemplateSelector { constructor({ mediator }) { diff --git a/app/assets/javascripts/blob/template_selectors/gitignore_selector.js b/app/assets/javascripts/blob/template_selectors/gitignore_selector.js index 1bb1cbb74de..50a11692e98 100644 --- a/app/assets/javascripts/blob/template_selectors/gitignore_selector.js +++ b/app/assets/javascripts/blob/template_selectors/gitignore_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class BlobGitignoreSelector extends FileTemplateSelector { constructor({ mediator }) { diff --git a/app/assets/javascripts/blob/template_selectors/license_selector.js b/app/assets/javascripts/blob/template_selectors/license_selector.js index affa20997e9..e7fabf18ea1 100644 --- a/app/assets/javascripts/blob/template_selectors/license_selector.js +++ b/app/assets/javascripts/blob/template_selectors/license_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class BlobLicenseSelector extends FileTemplateSelector { constructor({ mediator }) { @@ -30,6 +30,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector { const data = { project: this.$dropdown.data('project'), fullname: this.$dropdown.data('fullname'), + source_template_project_id: query.project_id, }; this.reportSelection({ diff --git a/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js b/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js index 42adab05ce3..8b10b02ae1d 100644 --- a/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js +++ b/app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class MetricsDashboardSelector extends FileTemplateSelector { constructor({ mediator }) { diff --git a/app/assets/javascripts/blob/template_selectors/type_selector.js b/app/assets/javascripts/blob/template_selectors/type_selector.js index f74f7535d99..65e7ff0594c 100644 --- a/app/assets/javascripts/blob/template_selectors/type_selector.js +++ b/app/assets/javascripts/blob/template_selectors/type_selector.js @@ -1,5 +1,5 @@ -import FileTemplateSelector from '../file_template_selector'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import FileTemplateSelector from '../file_template_selector'; export default class FileTemplateTypeSelector extends FileTemplateSelector { constructor({ mediator, dropdownData }) { diff --git a/app/assets/javascripts/blob/viewer/index.js b/app/assets/javascripts/blob/viewer/index.js index 4e6ec20ec64..b4cd0d5d875 100644 --- a/app/assets/javascripts/blob/viewer/index.js +++ b/app/assets/javascripts/blob/viewer/index.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; +import { __ } from '~/locale'; +import { fixTitle } from '~/tooltips'; import { deprecatedCreateFlash as Flash } from '../../flash'; -import { handleLocationHash } from '../../lib/utils/common_utils'; import axios from '../../lib/utils/axios_utils'; +import { handleLocationHash } from '../../lib/utils/common_utils'; import eventHub from '../../notes/event_hub'; -import { __ } from '~/locale'; -import { fixTitle } from '~/tooltips'; const loadRichBlobViewer = (type) => { switch (type) { |