[Pkg-mozext-commits] [requestpolicy] 191/257: Merge branch 'introduce-jscs' into dev-1.0

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 45f969cff751ac5ec6fbe03eedbed64377e16d0e
Merge: 782a543 32f188a
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu Dec 3 15:38:05 2015 +0100

    Merge branch 'introduce-jscs' into dev-1.0

 .gitignore                                         |   1 +
 .jscsrc                                            |  10 +
 .jshintrc                                          |   2 +-
 Makefile                                           |   4 +-
 src/bootstrap.js                                   |   4 +-
 src/content/lib/environment.jsm                    |  20 +-
 src/content/lib/environment.process.js             |  38 +--
 .../lib/framescript-to-overlay-communication.jsm   |   2 +-
 src/content/lib/gui-location.jsm                   |  36 ++-
 src/content/lib/http-response.jsm                  |  21 +-
 src/content/lib/logger.jsm                         |  18 +-
 src/content/lib/manager-for-event-listeners.jsm    |  30 +--
 src/content/lib/manager-for-message-listeners.jsm  |  34 ++-
 src/content/lib/observer-manager.jsm               |   8 +-
 src/content/lib/old-rules.jsm                      |  14 +-
 src/content/lib/policy-manager.alias-functions.js  |   6 -
 src/content/lib/policy-manager.jsm                 |  31 ++-
 src/content/lib/prefs.jsm                          |  19 +-
 src/content/lib/request-processor.compat.js        |  22 +-
 src/content/lib/request-processor.jsm              | 207 +++++++--------
 src/content/lib/request-processor.redirects.js     |  22 +-
 src/content/lib/request-result.jsm                 |   8 +-
 src/content/lib/request-set.jsm                    |  47 ++--
 src/content/lib/request.jsm                        |   8 +-
 src/content/lib/ruleset-storage.jsm                |   8 +-
 src/content/lib/ruleset.jsm                        | 203 +++++++-------
 src/content/lib/script-loader.jsm                  |  15 +-
 src/content/lib/subscription.jsm                   | 204 +++++++-------
 src/content/lib/utils.jsm                          |   7 -
 src/content/lib/utils/dom.jsm                      |   4 +-
 src/content/lib/utils/domains.jsm                  |   9 +-
 src/content/lib/utils/files.jsm                    |  37 ++-
 src/content/lib/utils/info.jsm                     |   2 +-
 src/content/lib/utils/windows.jsm                  |   7 +-
 src/content/lib/utils/xul.jsm                      |  18 +-
 src/content/main/about-uri.jsm                     |  22 +-
 src/content/main/content-policy.jsm                |  27 +-
 src/content/main/default-pref-handler.js           |   1 -
 src/content/main/pref-manager.jsm                  |   5 -
 src/content/main/requestpolicy-service.jsm         |  34 +--
 src/content/main/window-manager-toolbarbutton.js   |   6 +-
 src/content/main/window-manager.jsm                |  28 +-
 src/content/main/window-manager.listener.js        |  11 +-
 src/content/settings/advancedprefs.js              | 149 +++++------
 src/content/settings/basicprefs.js                 |  77 +++---
 src/content/settings/common.js                     |  40 ++-
 src/content/settings/defaultpolicy.js              |  62 ++---
 src/content/settings/oldrules.js                   |  61 +++--
 src/content/settings/setup.js                      |  97 +++----
 src/content/settings/subscriptions.js              |  81 +++---
 src/content/settings/yourpolicy.js                 | 121 +++++----
 src/content/ui/classicmenu.js                      |  23 +-
 src/content/ui/frame.dom-content-loaded.js         |  13 +-
 src/content/ui/frame.js                            |  18 +-
 src/content/ui/menu.js                             | 292 +++++++++++----------
 src/content/ui/overlay.js                          | 155 +++++------
 src/content/ui/request-log.filtering.js            |  10 +-
 src/content/ui/request-log.interface.js            |  15 +-
 src/content/ui/request-log.js                      |   7 +-
 src/content/ui/request-log.tree-view.js            |  16 +-
 src/content/ui/xul-trees.js                        |   4 -
 61 files changed, 1164 insertions(+), 1337 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git