Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/components/answer-new.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import ErrorHandlingComponent from './error-handling';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import isEqual from 'lodash/isEqual';
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import validate from 'validate.js';
import $ from 'jquery';
import { all, reject, resolve } from 'rsvp';

Expand Down Expand Up @@ -292,7 +293,7 @@ export default class AnswerNew extends ErrorHandlingComponent {
};
let constraints = this.constraints;

let errors = window.validate(values, constraints);
let errors = validate(values, constraints);
if (errors) {
for (let key of Object.keys(errors)) {
let errorProp = `${key}Errors`;
Expand Down
3 changes: 2 additions & 1 deletion app/components/assignment-new.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { service } from '@ember/service';
import validate from 'validate.js';
import moment from 'moment';

export default class AssignmentNewComponent extends Component {
Expand Down Expand Up @@ -388,7 +389,7 @@ export default class AssignmentNewComponent extends Component {

const constraints = this.constraints;

let errors = window.validate(values, constraints);
let errors = validate(values, constraints);
if (errors) {
// errors
for (let key of Object.keys(errors)) {
Expand Down
3 changes: 2 additions & 1 deletion app/components/search-bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Component from '@ember/component';
import { computed } from '@ember/object';
/*global _:false */
import { alias } from '@ember/object/computed';
import validate from 'validate.js';

export default Component.extend({
classNames: ['search-bar-comp'],
Expand Down Expand Up @@ -117,7 +118,7 @@ export default Component.extend({
let values = { query: val };
let constraints = this.inputConstraints;

let errors = window.validate(values, constraints);
let errors = validate(values, constraints);
if (errors) {
for (let key of Object.keys(errors)) {
let errorProp = `${key}Errors`;
Expand Down
5 changes: 3 additions & 2 deletions app/components/section-new.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import ErrorHandlingComponent from './error-handling';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { later } from '@ember/runloop';
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import validate from 'validate.js';
import $ from 'jquery';

export default class SectionNewComponent extends ErrorHandlingComponent {
Expand Down Expand Up @@ -110,7 +111,7 @@ export default class SectionNewComponent extends ErrorHandlingComponent {
teacher: teacher,
organization: organization,
};
let validation = window.validate(values, constraints);
let validation = validate(values, constraints);
if (validation) {
// errors
for (let key of Object.keys(validation)) {
Expand Down
5 changes: 3 additions & 2 deletions app/components/workspace-new-settings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
/*global _:false */
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import validate from 'validate.js';

export default Component.extend({
elementId: 'workspace-new-settings',
Expand Down Expand Up @@ -200,7 +201,7 @@ export default Component.extend({
const permissions = this.workspacePermissions;
const submissionSettings = this.selectedSubmissionSettings;

errors = window.validate(
errors = validate(
{ workspaceName, owner, privacySetting },
this.constraints
);
Expand Down
7 changes: 4 additions & 3 deletions app/components/ws-copy-owner-settings.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
/*global _:false */
import { inject as service } from '@ember/service';
import { service } from '@ember/service';
import validate from 'validate.js';
import CurrentUserMixin from '../mixins/current_user_mixin';

export default Component.extend(CurrentUserMixin, {
Expand Down Expand Up @@ -183,12 +184,12 @@ export default Component.extend(CurrentUserMixin, {
if (!doCreateFolderSet) {
this.set('folderSetName', null);
this.set('folderSetPrivacy', null);
errors = window.validate(
errors = validate(
{ name, owner, mode, doCreateFolderSet },
this.constraints
);
} else {
errors = window.validate(
errors = validate(
{
name,
owner,
Expand Down
1 change: 0 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = function (defaults) {
*/

app.import('vendor/guiders.js');
app.import('vendor/validate.min.js');
app.import('vendor/dropzone.js');

// Use `app.import` to add additional libraries to the generated
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
"typeahead.js": "^0.11.1",
"underscore": "^1.13.6",
"uuid": "^8.3.2",
"validate.js": "^0.13.1",
"wordcloud": "^1.2.2"
},
"devDependencies": {
Expand Down
8 changes: 0 additions & 8 deletions vendor/validate.min.js

This file was deleted.

Loading