Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated summary view. #25

Merged
merged 15 commits into from Apr 4, 2018

Fix linting errors

  • Loading branch information
IAmThePan committed Apr 4, 2018
commit c30cef1280d443f80dba0e2658ee87b90ac08ef9
@@ -11,15 +11,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import { GET_BLOCKING_DATA,
import {
GET_BLOCKING_DATA,
UPDATE_BLOCK_ALL_TRACKERS,
UPDATE_CATEGORIES,
UPDATE_CATEGORY_BLOCKED,
UPDATE_TRACKER_BLOCKED,
UPDATE_TRACKER_TRUST_RESTRICT,
TOGGLE_EXPANDED,
TOGGLE_EXPAND_ALL,
TOGGLE_EXPAND_CATEGORY } from '../constants/constants';
TOGGLE_EXPAND_CATEGORY
} from '../constants/constants';
import { sendMessageInPromise } from '../utils/msg';

/**
@@ -11,15 +11,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import { GET_PANEL_DATA, GET_SUMMARY_DATA, GET_BLOCKING_DATA,
import {
GET_PANEL_DATA, GET_SUMMARY_DATA, GET_BLOCKING_DATA,
SHOW_NOTIFICATION,
TOGGLE_CLIQZ_FEATURE,
CLOSE_NOTIFICATION,
TOGGLE_EXPERT,
LOGIN_SUCCESS, LOGIN_FAILED,
LOGOUT,
CREATE_ACCOUNT_SUCCESS, CREATE_ACCOUNT_FAILED,
FORGOT_PASSWORD_SUCCESS, FORGOT_PASSWORD_FAILED } from '../constants/constants';
FORGOT_PASSWORD_SUCCESS, FORGOT_PASSWORD_FAILED
} from '../constants/constants';
import { sendMessageInPromise } from '../utils/msg';
import { doXHR } from '../utils/utils';
import globals from '../../../src/classes/Globals';
@@ -10,7 +10,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/
import { GET_SETTINGS_DATA,
import {
GET_SETTINGS_DATA,
IMPORT_SETTINGS_DIALOG,
IMPORT_SETTINGS_NATIVE,
IMPORT_SETTINGS_FAILED,
@@ -26,7 +27,8 @@ import { GET_SETTINGS_DATA,
SETTINGS_TOGGLE_EXPAND_CATEGORY,
SETTINGS_UPDATE_SEARCH_VALUE,
SETTINGS_SEARCH_SUBMIT,
SETTINGS_FILTER } from '../constants/constants';
SETTINGS_FILTER
} from '../constants/constants';
import { sendMessageInPromise } from '../utils/msg';
import { hashCode } from '../../../src/utils/common';
import globals from '../../../src/classes/Globals';
@@ -280,4 +282,3 @@ export function filter(data) {
data,
};
}

@@ -11,12 +11,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import { GET_SUMMARY_DATA,
import {
GET_SUMMARY_DATA,
UPDATE_TRACKER_COUNTS,
UPDATE_GHOSTERY_PAUSED,
UPDATE_SITE_POLICY,
FILTER_TRACKERS,
TOGGLE_EXPERT } from '../constants/constants';
TOGGLE_EXPERT
} from '../constants/constants';
import { sendMessageInPromise } from '../utils/msg';

/**
@@ -12,15 +12,17 @@
*/

/* eslint no-use-before-define: 0 */
import { GET_BLOCKING_DATA,
import {
GET_BLOCKING_DATA,
FILTER_TRACKERS,
UPDATE_BLOCK_ALL_TRACKERS,
UPDATE_CATEGORIES,
UPDATE_CATEGORY_BLOCKED,
UPDATE_TRACKER_BLOCKED,
UPDATE_TRACKER_TRUST_RESTRICT,
TOGGLE_EXPAND_ALL,
TOGGLE_EXPAND_CATEGORY } from '../constants/constants';
TOGGLE_EXPAND_CATEGORY
} from '../constants/constants';
import { updateTrackerBlocked, updateCategoryBlocked, updateBlockAllTrackers, toggleExpandAll, toggleExpandCategory } from '../utils/blocking';
import { removeFromObject, updateObject } from '../utils/utils';
import { sendMessage } from '../utils/msg';
@@ -13,7 +13,8 @@

/* eslint no-use-before-define: 0 */

import { GET_PANEL_DATA,
import {
GET_PANEL_DATA,
SHOW_NOTIFICATION,
CLOSE_NOTIFICATION,
LOGIN_SUCCESS,
@@ -22,7 +23,8 @@ import { GET_PANEL_DATA,
TOGGLE_EXPANDED,
TOGGLE_EXPERT,
TOGGLE_CLIQZ_FEATURE,
UPDATE_NOTIFICATION_STATUS } from '../constants/constants';
UPDATE_NOTIFICATION_STATUS
} from '../constants/constants';
import { sendMessage } from '../utils/msg';

const initialState = {
@@ -14,7 +14,8 @@
/* eslint no-use-before-define: 0 */

import moment from 'moment/min/moment-with-locales.min';
import { GET_SETTINGS_DATA,
import {
GET_SETTINGS_DATA,
IMPORT_SETTINGS_DIALOG,
IMPORT_SETTINGS_NATIVE,
IMPORT_SETTINGS_FAILED,
@@ -28,7 +29,8 @@ import { GET_SETTINGS_DATA,
SETTINGS_TOGGLE_EXPAND_ALL,
SETTINGS_TOGGLE_EXPAND_CATEGORY,
SETTINGS_UPDATE_SEARCH_VALUE,
SETTINGS_FILTER } from '../constants/constants';
SETTINGS_FILTER
} from '../constants/constants';
import { updateTrackerBlocked, updateCategoryBlocked, updateBlockAllTrackers, toggleExpandAll, toggleExpandCategory } from '../utils/blocking';
import { removeFromObject, updateObject } from '../utils/utils';
import { sendMessage } from '../utils/msg';
@@ -13,10 +13,12 @@

/* eslint no-use-before-define: 0 */

import { GET_SUMMARY_DATA,
import {
GET_SUMMARY_DATA,
UPDATE_GHOSTERY_PAUSED,
UPDATE_SITE_POLICY,
UPDATE_TRACKER_COUNTS } from '../constants/constants';
UPDATE_TRACKER_COUNTS
} from '../constants/constants';
import { addToArray, removeFromArray } from '../utils/utils';
import { sendMessage } from '../utils/msg';

@@ -11,9 +11,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import {
UPDATE_DISPLAY_MODE
} from '../constants/constants';
import { UPDATE_DISPLAY_MODE } from '../constants/constants';
import { msg } from '../utils';

const initialState = {
ProTip! Use n and p to navigate between commits in a pull request.