Convert meteor-autocomplete package to main module structure (#12491)

* First wave of removal of Meteor global

* Second wave of removal of Meteor global

* Third wave of removal of Meteor global

* Fix tests

* Remove global variable SHA256

* Remove global variable WebApp

* Remove global variable EJSON

* Remove global variable Email

* Remove global variable HTTP

* Remove global variable Random

* Remove global variable ReactiveDict

* Remove global variable ReactiveVar

* Remove global variable Accounts

* Remove globals variables Match and check

* Remove global variable Mongo

* Remove global variable moment

* Remove global variable Tracker

* Remove global variable Blaze

* Remove global variables FlowRouter and BlazeLayout

* Add FlowRouter to eslint global in tests file

* Remove global variable DDPRateLimiter

* Remove global variable Session

* Remove global variable UAParser

* Remove global variable Promise

* Remove global variable Reload

* Remove global variable CryptoJS

* Remove global variable Template

* Remove global variable TAPi18n

* Remove global variable TAPi18next

* Exposing t function from rocketchat:ui package

* Convert chatpal search to main module structure

* Fix ESLint

* Convert meteor-accounts-saml to main module structure

* Convert meteor-autocomplete to main module structure
pull/12495/head^2
Marcos Spessatto Defendi 7 years ago committed by Rodrigo Nascimento
parent c5a14f2196
commit b8714053a2
  1. 7
      packages/meteor-autocomplete/client/autocomplete-client.js
  2. 8
      packages/meteor-autocomplete/client/index.js
  3. 2
      packages/meteor-autocomplete/client/templates.js
  4. 28
      packages/meteor-autocomplete/package.js
  5. 1
      packages/meteor-autocomplete/server/index.js
  6. 3
      packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
  7. 1
      packages/rocketchat-channel-settings-mail-messages/package.js
  8. 2
      packages/rocketchat-ui-clean-history/client/views/cleanHistory.js
  9. 3
      packages/rocketchat-ui-flextab/client/tabs/inviteUsers.js
  10. 1
      packages/rocketchat-ui-flextab/package.js
  11. 3
      packages/rocketchat-ui/client/views/app/createChannel.js
  12. 1
      packages/rocketchat-ui/package.js

@ -1,9 +1,10 @@
/* globals Deps, getCaretCoordinates*/
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Blaze } from 'meteor/blaze';
import { Deps } from 'meteor/deps';
import _ from 'underscore';
import AutoCompleteRecords from './collection';
import { getCaretCoordinates } from 'meteor/dandv:caret-position';
const isServerSearch = function(rule) {
return _.isString(rule.collection);
@ -72,7 +73,7 @@ const getField = function(obj, str) {
return obj;
};
this.AutoComplete = class {
export default class AutoComplete {
constructor(settings) {
this.KEYS = [40, 38, 13, 27, 9];
this.limit = settings.limit || 5;
@ -454,4 +455,4 @@ this.AutoComplete = class {
return this.rules[this.matched].template;
}
};
}

@ -0,0 +1,8 @@
import './autocomplete.css';
import './inputs.html';
import './templates';
import AutoComplete from './autocomplete-client';
export {
AutoComplete,
};

@ -1,6 +1,6 @@
/* globals AutoComplete */
import { Blaze } from 'meteor/blaze';
import { Template } from 'meteor/templating';
import AutoComplete from './autocomplete-client';
import _ from 'underscore';
// Events on template instances, sent to the autocomplete class

@ -6,23 +6,19 @@ Package.describe({
});
Package.onUse(function(api) {
api.use(['blaze', 'templating', 'jquery'], 'client');
api.use(['ecmascript']); // both
api.use(['mongo', 'ddp']);
api.use([
'ecmascript',
'mongo',
'ddp',
]);
api.use('dandv:caret-position@2.1.0-3', 'client');
// Our files
api.addFiles([
'client/autocomplete.css',
'client/inputs.html',
'client/autocomplete-client.js',
'client/templates.js',
api.use([
'blaze',
'templating',
'jquery',
'dandv:caret-position@2.1.0-3',
], 'client');
api.addFiles([
'server/autocomplete-server.js',
], 'server');
api.export('Autocomplete', 'server');
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
});

@ -0,0 +1 @@
import './autocomplete-server';

@ -1,9 +1,10 @@
/* global AutoComplete Deps */
/* global Deps */
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Blaze } from 'meteor/blaze';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import toastr from 'toastr';
import resetSelection from '../resetSelection';

@ -13,6 +13,7 @@ Package.onUse(function(api) {
'less',
'rocketchat:lib',
'rocketchat:channel-settings',
'mizzao:autocomplete',
'mongo',
]);

@ -1,9 +1,9 @@
/* globals AutoComplete */
import { Tracker } from 'meteor/tracker';
import { Blaze } from 'meteor/blaze';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import moment from 'moment';
import { call } from 'meteor/rocketchat:lib';

@ -3,6 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Blaze } from 'meteor/blaze';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import toastr from 'toastr';
const acEvents = {
@ -121,7 +122,7 @@ Template.inviteUsers.onRendered(function() {
users.set(usersArr);
});
});
/* global AutoComplete Deps */
/* global Deps */
Template.inviteUsers.onCreated(function() {
this.selectedUsers = new ReactiveVar([]);
const filter = { exceptions :[Meteor.user().username].concat(this.selectedUsers.get().map((u) => u.username)) };

@ -16,6 +16,7 @@ Package.onUse(function(api) {
'ecmascript',
'templating',
'rocketchat:lib',
'mizzao:autocomplete',
]);
api.addFiles('client/flexTabBar.html', 'client');

@ -4,6 +4,7 @@ import { Tracker } from 'meteor/tracker';
import { Blaze } from 'meteor/blaze';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { AutoComplete } from 'meteor/mizzao:autocomplete';
import _ from 'underscore';
const acEvents = {
@ -266,7 +267,7 @@ Template.createChannel.onRendered(function() {
users.set(usersArr);
});
});
/* global AutoComplete */
Template.createChannel.onCreated(function() {
this.selectedUsers = new ReactiveVar([]);

@ -26,6 +26,7 @@ Package.onUse(function(api) {
'raix:ui-dropped-event',
'rocketchat:lazy-load',
'rocketchat:e2e',
'mizzao:autocomplete',
]);
api.use('kadira:flow-router', 'client');

Loading…
Cancel
Save