Skip to content

Commit 57e0ae8

Browse files
committed
Merge branch 'release/0.4.0'
2 parents 8393568 + 115c244 commit 57e0ae8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+855
-588
lines changed

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.git
2+
**/bower_components
3+
**/dist
4+
**/node_modules
5+
**/tmp

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
coverage
2+
dist
3+
docs
4+
tmp

.eslintrc.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 6,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
browser: true,
10+
es6: true
11+
},
12+
globals: {
13+
MathJax: true
14+
},
15+
rules: {}
16+
};

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
.npmrc
1717
npm-debug.log
1818
testem.log
19+
.idea
1920

2021
# Never commit configuration or private settings
2122
config/*.yml

.jshintrc

Lines changed: 0 additions & 34 deletions
This file was deleted.

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* jshint node:true */
1+
/* eslint-env node */
22
'use strict';
33

44
module.exports = {

Dockerfile

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
FROM node:boron
2+
3+
RUN apt-get update \
4+
&& apt-get install -y \
5+
git \
6+
# Next 2 needed for yarn
7+
apt-transport-https \
8+
ca-certificates \
9+
# watchman
10+
build-essential \
11+
automake \
12+
autoconf \
13+
python-dev \
14+
&& apt-get clean \
15+
&& apt-get autoremove -y \
16+
&& rm -rf /var/lib/apt/lists/*
17+
18+
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
19+
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
20+
&& apt-get update \
21+
&& apt-get install -y \
22+
yarn \
23+
&& apt-get clean \
24+
&& apt-get autoremove -y \
25+
&& rm -rf /var/lib/apt/lists/*
26+
27+
ENV WATCHMAN_VERSION 4.7.0
28+
RUN cd /tmp \
29+
&& git clone https://github.com/facebook/watchman.git \
30+
&& cd watchman \
31+
&& git checkout v$WATCHMAN_VERSION \
32+
&& ./autogen.sh \
33+
&& ./configure --enable-statedir=/tmp \
34+
&& make \
35+
&& make install \
36+
&& mv watchman /usr/local/bin/watchman \
37+
&& rm -Rf /tmp/watchman
38+
39+
RUN mkdir -p /code
40+
WORKDIR /code
41+
42+
COPY ./package.json ./yarn.lock /code/
43+
RUN yarn --pure-lockfile
44+
45+
COPY ./.bowerrc /code/.bowerrc
46+
COPY ./bower.json /code/bower.json
47+
RUN ./node_modules/bower/bin/bower install --allow-root --config.interactive=false
48+
49+
COPY ./ /code/
50+
51+
ARG GIT_COMMIT=
52+
ENV GIT_COMMIT ${GIT_COMMIT}
53+
54+
ARG APP_ENV=production
55+
ENV APP_ENV ${APP_ENV}
56+
ARG BACKEND=local
57+
ENV BACKEND ${BACKEND}
58+
RUN ./node_modules/ember-cli/bin/ember build --env ${APP_ENV}
59+
60+
CMD ["yarn", "test"]

addon/adapters/osf-adapter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default DS.JSONAPIAdapter.extend(HasManyQuery.RESTAdapterMixin, GenericDa
9393
* @param {String} url
9494
* @param {Boolean} isBulk
9595
**/
96-
_createRelated(store, snapshot, createdSnapshots, relationship, url, isBulk = false) { // jshint ignore:line
96+
_createRelated(store, snapshot, createdSnapshots, relationship, url) { //, isBulk = false) {
9797
// TODO support bulk create?
9898
// if (isBulk) {
9999
//
@@ -183,7 +183,7 @@ export default DS.JSONAPIAdapter.extend(HasManyQuery.RESTAdapterMixin, GenericDa
183183
* @param {String} url
184184
* @param {Boolean} isBulk
185185
**/
186-
_deleteRelated(store, snapshot, deletedSnapshots, relationship, url, isBulk = false) { // jshint ignore:line
186+
_deleteRelated(store, snapshot, deletedSnapshots) { //, relationship, url, isBulk = false) {
187187
return this._removeRelated(...arguments).then(() => {
188188
deletedSnapshots.forEach(s => s.record.unloadRecord());
189189
});

addon/components/dropzone-widget/component.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* global Dropzone */
2+
13
import Ember from 'ember';
24
import config from 'ember-get-config';
35

@@ -32,10 +34,7 @@ export default Ember.Component.extend({
3234
let preUpload = this.get('preUpload');
3335
let dropzoneOptions = this.get('options') || {};
3436

35-
if (!this.get('buildUrl') && !preUpload && !dropzoneOptions.url) {
36-
console.error('Need to define url somewhere');
37-
}
38-
let drop = new Dropzone(`#${this.elementId}`, { // jshint ignore:line
37+
let drop = new Dropzone(`#${this.elementId}`, {
3938
url: file => typeof this.get('buildUrl') === 'function' ? this.get('buildUrl')(file) : this.get('buildUrl'),
4039
autoProcessQueue: false,
4140
dictDefaultMessage: this.get('defaultMessage') || 'Drop files here to upload'

addon/components/file-widget/component.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ export default Ember.Component.extend({
6262
selectNodeFile(file) {
6363
this.send('selectFile', file.get('links.download'));
6464
},
65-
selectNode(node) {
66-
console.log(node);
67-
},
68-
selectFile(url) {
69-
console.log(url);
70-
},
7165
preUpload() {
7266
return new Ember.RSVP.Promise((resolve) => resolve());
7367
}

0 commit comments

Comments
 (0)