Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-09 12:23:07 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-09 12:23:07 +0300
commita3ba3381219250c2f464d36ed9885bcfb247455a (patch)
tree8a21a0cf6b916e88ed58fd942809e1fdaddc902c
parent21b907b5b33cb862f0487a05a5c1e0211242f384 (diff)
Remove dataset dependency from constructor
-rw-r--r--app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js6
-rw-r--r--app/assets/javascripts/blob/balsamiq_viewer.js5
-rw-r--r--spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js10
3 files changed, 10 insertions, 11 deletions
diff --git a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
index 27460a0ba71..4d72e36279b 100644
--- a/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
+++ b/app/assets/javascripts/blob/balsamiq/balsamiq_viewer.js
@@ -13,15 +13,15 @@ const PREVIEW_TEMPLATE = _template(`
`);
class BalsamiqViewer {
- constructor(viewer) {
+ constructor(viewer, endpoint) {
this.viewer = viewer;
+ this.endpoint = endpoint;
}
loadFile() {
const xhr = new XMLHttpRequest();
- const endpoint = this.viewer.dataset.endpoint;
- xhr.open('GET', endpoint, true);
+ xhr.open('GET', this.endpoint, true);
xhr.responseType = 'arraybuffer';
xhr.onload = this.renderFile.bind(this);
diff --git a/app/assets/javascripts/blob/balsamiq_viewer.js b/app/assets/javascripts/blob/balsamiq_viewer.js
index 546a151a3f7..5170aa7ee37 100644
--- a/app/assets/javascripts/blob/balsamiq_viewer.js
+++ b/app/assets/javascripts/blob/balsamiq_viewer.js
@@ -1,7 +1,10 @@
import BalsamiqViewer from './balsamiq/balsamiq_viewer';
function loadBalsamiqViewer() {
- const balsamiqViewer = new BalsamiqViewer(document.getElementById('js-balsamiq-viewer'));
+ const viewer = document.getElementById('js-balsamiq-viewer');
+ const endpoint = viewer.dataset.endpoint;
+
+ const balsamiqViewer = new BalsamiqViewer(viewer, endpoint);
balsamiqViewer.loadFile();
}
diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
index 2e58d202f81..26f483dcc26 100644
--- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
+++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js
@@ -2,7 +2,7 @@ import sqljs from 'sql.js';
import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer';
import ClassSpecHelper from '../../helpers/class_spec_helper';
-describe('BalsamiqViewer', () => {
+fdescribe('BalsamiqViewer', () => {
let balsamiqViewer;
let endpoint;
let viewer;
@@ -10,13 +10,9 @@ describe('BalsamiqViewer', () => {
describe('class constructor', () => {
beforeEach(() => {
endpoint = 'endpoint';
- viewer = {
- dataset: {
- endpoint,
- },
- };
+ viewer = {};
- balsamiqViewer = new BalsamiqViewer(viewer);
+ balsamiqViewer = new BalsamiqViewer(viewer, endpoint);
});
it('should set .viewer', () => {